commit 2e35bd8c60f880d07c63631b0738315036aeace1
Author: bobwang <8205347@qq.com>
Date:   Sun Feb 18 23:33:54 2024 +0800

    add

diff --git a/App_Code/.svn/entries b/App_Code/.svn/entries
new file mode 100644
index 0000000..c0dedaf
--- /dev/null
+++ b/App_Code/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/App_Code
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+PagePublic.cs
+file
+
+
+
+
+2011-04-01T02:51:10.289868Z
+88adefccb355a757a198d9d5710b8905
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+637
+
+ExcelExp.cs
+file
+
+
+
+
+2011-04-01T02:51:10.305493Z
+622cd19125108d2405c68fbaa5dd594a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1888
+
+SessionEndModule.cs
+file
+
+
+
+
+2011-04-01T02:51:10.305493Z
+afc00bfe8b5a4c00a5defa6a1221b0fb
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5243
+
+PageBase.cs
+file
+
+
+
+
+2011-04-01T02:51:10.321118Z
+ada92b7d54cfb24aba200636f6b94af8
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2850
+
diff --git a/App_Code/.svn/text-base/ExcelExp.cs.svn-base b/App_Code/.svn/text-base/ExcelExp.cs.svn-base
new file mode 100644
index 0000000..118e6ca
--- /dev/null
+++ b/App_Code/.svn/text-base/ExcelExp.cs.svn-base
@@ -0,0 +1,55 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// utils 的摘要说明
+    /// </summary>
+    public class ExcelExp
+    {
+        public ExcelExp()
+        {
+            //
+            // TODO: 在此处添加构造函数逻辑
+            //
+        }
+
+ 
+        public static void Export(GridView GridView1, DataView dv ,ScriptManager sm,Control Button1,string fileName, Page page )
+        {
+             sm.RegisterPostBackControl(Button1);
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            
+           
+            HttpContext.Current.Response.Charset = "GB2312";
+            HttpContext.Current.Response.ContentEncoding = Encoding.UTF7;
+            HttpContext.Current.Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(fileName + ".xls", Encoding.UTF8).ToString());
+            HttpContext.Current.Response.ContentType = "application/ms-excel";
+            page.EnableViewState = false;
+            StringWriter tw = new StringWriter();
+            HtmlTextWriter hw = new HtmlTextWriter(tw);
+            GridView1.RenderControl(hw);
+            HttpContext.Current.Response.Write(tw.ToString());
+            HttpContext.Current.Response.End();
+
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/App_Code/.svn/text-base/PageBase.cs.svn-base b/App_Code/.svn/text-base/PageBase.cs.svn-base
new file mode 100644
index 0000000..8245cc0
--- /dev/null
+++ b/App_Code/.svn/text-base/PageBase.cs.svn-base
@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using ZhangPu.Gov.Logical;
+
+/// <summary>
+/// utils 的摘要说明
+/// </summary>
+public class PageBase : PagePublic
+{
+    public PageBase()
+    {
+      
+    }
+
+
+     
+ //　protected LEmployee lem;
+ //  const string DefaultPage = "~/index.aspx";
+ //  const string HomePage = "~/Desktop.aspx";
+
+    public void CheckAuthority()
+    {
+        if (checkCloseIE()) return;
+
+        string requestPage = Request.AppRelativeCurrentExecutionFilePath + Request.Url.Query;
+        requestPage = requestPage.ToUpper();
+        //   if (DefaultPage.Equals(requestPage)) return;  //起始页不做判断
+        if (DefaultPage.ToUpper() == requestPage) return; //起始页不做判断
+
+        if (lem == null)
+        {
+            logobj.LoginLog(string.Empty,"lem is null");
+            Response.Redirect(DefaultPage);
+        }
+        if (HomePage.ToUpper() == requestPage) return;
+        if (lem.GetEmployee.em_account == "Root") //内建管理员
+        {
+
+            return;
+        }
+
+        if (lem.AuthList.Contains(requestPage)) return;
+        if (!new LRoleAuthority().GetPublicAuthorityList().Contains(requestPage))
+        {
+            logobj.RequestPageLog();
+            
+            logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
+            
+            Response.Redirect(DefaultPage);
+        }
+
+    }
+
+    protected override void OnPreInit(EventArgs e)
+      {
+       
+        base.OnPreInit(e);
+      
+        CheckAuthority(); 
+        
+      }
+    bool checkCloseIE()
+    {
+        if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+        {
+            string cmd = Request.QueryString["___command"];
+            if (cmd == "ClearSession")
+            {
+                if ((Session["CurrentUser"] != null))
+                {
+
+                    if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                        if (Session["CurrentUserId"] != null)
+                        {
+                            //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            myLog.RequestLog logobj = new myLog.RequestLog();
+                            logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                }
+                Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                return true;
+            }
+        }
+        return false;
+    }
+ 
+}
diff --git a/App_Code/.svn/text-base/PagePublic.cs.svn-base b/App_Code/.svn/text-base/PagePublic.cs.svn-base
new file mode 100644
index 0000000..f64f45c
--- /dev/null
+++ b/App_Code/.svn/text-base/PagePublic.cs.svn-base
@@ -0,0 +1,26 @@
+using System;
+using System.Web.UI;
+using ZhangPu.Gov.Logical;
+
+/// <summary>
+/// PagePublic 的摘要说明
+/// </summary>
+public class PagePublic : Page
+{
+    protected LEmployee lem;
+    protected const string DefaultPage = "~/index.aspx";
+    protected const string HomePage = "~/Desktop.aspx";
+    protected myLog.RequestLog logobj;
+    public PagePublic()
+    {
+   　
+    }
+    protected override void OnPreInit(EventArgs e)
+    {
+      　 lem = (LEmployee)Session["CurrentUser"];
+      　
+        base.OnPreInit(e);
+         logobj = new myLog.RequestLog();
+        logobj.RequestPageLog();
+    }
+}
diff --git a/App_Code/.svn/text-base/SessionEndModule.cs.svn-base b/App_Code/.svn/text-base/SessionEndModule.cs.svn-base
new file mode 100644
index 0000000..328a35b
--- /dev/null
+++ b/App_Code/.svn/text-base/SessionEndModule.cs.svn-base
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+ 
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+using System.Web.UI;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// When an ASP.NET State Server other than InProc, the Session_End event
+    /// does not get fired.  This is an HttpModule which uses some workarounds
+    /// and fires a static event when a session ends, with the value of a single
+    /// configurable session variable in the event arguments.
+    /// </summary>
+    public class SessionEndModule : IHttpModule
+    {
+        #region Private Variables
+
+        private HttpApplication m_HttpApplication;
+        private static string m_SessionObjectKey;
+
+        #endregion
+
+        #region Accessors
+
+        /// <summary>
+        /// This is the key of the item in the session which should be returned
+        /// in the SessionEnd event (as the SessionObject).
+        /// </summary>
+        /// <example>
+        ///	If you're storing the user ID in the session, under a key called 'UserId'
+        /// and need to do something with it in the SessionEnd event, you would set
+        /// this to 'UserId', which would cause the value of the session key called
+        /// 'UserId' to be returned.
+        /// </example>
+        public static string SessionObjectKey
+        {
+            get
+            {
+                return m_SessionObjectKey;
+            }
+            set
+            {
+                m_SessionObjectKey = value;
+            }
+        }
+
+        #endregion
+
+        #region IHttpModule Implementation
+
+        public void Init(HttpApplication context)
+        {
+            m_HttpApplication = context;
+            m_HttpApplication.PreRequestHandlerExecute += new EventHandler(OnPreRequestHandlerExecute);
+        }
+
+        public void Dispose()
+        {
+            // Do Nothing
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Event raised when the session ends
+        /// </summary>
+        public static event SessionEndEventHandler SessionEnd;
+
+        #endregion
+
+        private void OnPreRequestHandlerExecute(object sender, EventArgs e)
+        {
+            // We only want to update the session when an ASPX page is being viewed
+            // We're also doing this in the PreRequestHandler, as doing it elsewhere
+            // (like the PostRequestHandler) can cause some strange behaviour.
+
+            if (Path.GetExtension(m_HttpApplication.Context.Request.Path).ToLower() == ".aspx")
+            {
+                // Ensure we have a HttpContext
+                if (HttpContext.Current == null)
+                {
+                    Debug.WriteLine("No current http context");
+                    return;
+                }
+
+                // Get the current session
+                HttpSessionState currentSession = HttpContext.Current.Session;
+
+                // Ensure we have a current session
+                if (currentSession == null)
+                {
+                    Debug.WriteLine("No current session");
+                    return;
+                }
+
+                // Get the session timeout
+                TimeSpan sessionTimeout = new TimeSpan(0, 0, currentSession.Timeout, 0, 0);
+
+                // Get the object in the session we want to retrieve when the session times out
+                object sessionObject = currentSession[SessionObjectKey];
+
+                // Add the object to the cache with the current session id, and set a cache removal callback method
+                HttpContext.Current.Cache.Insert(currentSession.SessionID, sessionObject, null, DateTime.MaxValue, sessionTimeout, CacheItemPriority.NotRemovable, CacheItemRemovedCallbackMethod);
+            }
+        }
+
+        /// <summary>
+        /// This method is fired when an item is removed from the cache.  It is used to detect when a cache item
+        /// expires, indicating that the session has expired, and fires the SessionEnd event.
+        /// </summary>
+        private void CacheItemRemovedCallbackMethod(string key, object value, CacheItemRemovedReason reason)
+        {
+            if (reason == CacheItemRemovedReason.Expired)
+            {
+                if (SessionEnd != null)
+                {
+                     SessionEndedEventArgs e = new SessionEndedEventArgs(key, value);
+                     SessionEnd(this, e);
+                     
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Event handler for handling the SessionEnd event
+    /// </summary>
+    public delegate void SessionEndEventHandler(object sender, SessionEndedEventArgs e);
+
+    /// <summary>
+    /// SessionEndedEventArgs for use in the SessionEnd event
+    /// </summary>
+    public class SessionEndedEventArgs : EventArgs
+    {
+        public readonly string SessionId;
+        public readonly object SessionObject;
+
+        public SessionEndedEventArgs(string sessionId, object sessionObject)
+        {   
+            SessionId = sessionId;
+            SessionObject = sessionObject;
+        }
+    }
+}
\ No newline at end of file
diff --git a/App_Code/ExcelExp.cs b/App_Code/ExcelExp.cs
new file mode 100644
index 0000000..118e6ca
--- /dev/null
+++ b/App_Code/ExcelExp.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// utils 的摘要说明
+    /// </summary>
+    public class ExcelExp
+    {
+        public ExcelExp()
+        {
+            //
+            // TODO: 在此处添加构造函数逻辑
+            //
+        }
+
+ 
+        public static void Export(GridView GridView1, DataView dv ,ScriptManager sm,Control Button1,string fileName, Page page )
+        {
+             sm.RegisterPostBackControl(Button1);
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            
+           
+            HttpContext.Current.Response.Charset = "GB2312";
+            HttpContext.Current.Response.ContentEncoding = Encoding.UTF7;
+            HttpContext.Current.Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(fileName + ".xls", Encoding.UTF8).ToString());
+            HttpContext.Current.Response.ContentType = "application/ms-excel";
+            page.EnableViewState = false;
+            StringWriter tw = new StringWriter();
+            HtmlTextWriter hw = new HtmlTextWriter(tw);
+            GridView1.RenderControl(hw);
+            HttpContext.Current.Response.Write(tw.ToString());
+            HttpContext.Current.Response.End();
+
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/App_Code/PageBase.cs b/App_Code/PageBase.cs
new file mode 100644
index 0000000..3cdb3ee
--- /dev/null
+++ b/App_Code/PageBase.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using DeiNiu.wms.Logical;
+
+/// <summary>
+/// utils 的摘要说明
+/// </summary>
+public class PageBase : PagePublic
+{
+    public PageBase()
+    {
+      
+    }
+
+
+     
+ //　protected LEmployee lem;
+ //  const string DefaultPage = "~/index.aspx";
+ //  const string HomePage = "~/Desktop.aspx";
+
+    public void CheckAuthority()
+    {
+        if (checkCloseIE()) return;
+
+        string requestPage = Request.AppRelativeCurrentExecutionFilePath + Request.Url.Query;
+        requestPage = requestPage.ToUpper();
+        //   if (DefaultPage.Equals(requestPage)) return;  //起始页不做判断
+        if (DefaultPage.ToUpper() == requestPage) return; //起始页不做判断
+
+        if (lem == null)
+        {
+           //logobj.LoginLog(string.Empty,"lem is null");
+            Response.Redirect(DefaultPage);
+        }
+        if (HomePage.ToUpper() == requestPage) return;
+        if (lem.GetEmployee.em_account == "Root") //内建管理员
+        {
+
+            return;
+        }
+
+        if (lem.AuthList.Contains(requestPage)) return;
+        if (!new LRoleAuthority().GetPublicAuthorityList().Contains(requestPage))
+        {
+           // logobj.RequestPageLog();
+            
+           // logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
+            
+            Response.Redirect(DefaultPage);
+        }
+
+    }
+
+    protected override void OnPreInit(EventArgs e)
+      {
+       
+        base.OnPreInit(e);
+      
+        CheckAuthority(); 
+        
+      }
+    bool checkCloseIE()
+    {
+        if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+        {
+            string cmd = Request.QueryString["___command"];
+            if (cmd == "ClearSession")
+            {
+                if ((Session["CurrentUser"] != null))
+                {
+
+                    if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                        if (Session["CurrentUserId"] != null)
+                        {
+                            //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                          //  logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                }
+                Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                return true;
+            }
+        }
+        return false;
+    }
+ 
+}
diff --git a/App_Code/PagePublic.cs b/App_Code/PagePublic.cs
new file mode 100644
index 0000000..5fee555
--- /dev/null
+++ b/App_Code/PagePublic.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Web.UI;
+using DeiNiu.wms.Logical;
+
+/// <summary>
+/// PagePublic 的摘要说明
+/// </summary>
+public class PagePublic : Page
+{
+    protected LEmployee lem;
+    protected const string DefaultPage = "~/index.aspx";
+    protected const string HomePage = "~/Desktop.aspx";
+    protected DeiNiu.RequestLog logobj;
+    public PagePublic()
+    {
+   　
+    }
+    protected override void OnPreInit(EventArgs e)
+    {
+      　 lem = (LEmployee)Session["CurrentUser"];
+      　
+        base.OnPreInit(e);
+         logobj = new DeiNiu.RequestLog();
+        logobj.RequestPageLog();
+    }
+}
diff --git a/App_Code/SessionEndModule.cs b/App_Code/SessionEndModule.cs
new file mode 100644
index 0000000..328a35b
--- /dev/null
+++ b/App_Code/SessionEndModule.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+ 
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+using System.Web.UI;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// When an ASP.NET State Server other than InProc, the Session_End event
+    /// does not get fired.  This is an HttpModule which uses some workarounds
+    /// and fires a static event when a session ends, with the value of a single
+    /// configurable session variable in the event arguments.
+    /// </summary>
+    public class SessionEndModule : IHttpModule
+    {
+        #region Private Variables
+
+        private HttpApplication m_HttpApplication;
+        private static string m_SessionObjectKey;
+
+        #endregion
+
+        #region Accessors
+
+        /// <summary>
+        /// This is the key of the item in the session which should be returned
+        /// in the SessionEnd event (as the SessionObject).
+        /// </summary>
+        /// <example>
+        ///	If you're storing the user ID in the session, under a key called 'UserId'
+        /// and need to do something with it in the SessionEnd event, you would set
+        /// this to 'UserId', which would cause the value of the session key called
+        /// 'UserId' to be returned.
+        /// </example>
+        public static string SessionObjectKey
+        {
+            get
+            {
+                return m_SessionObjectKey;
+            }
+            set
+            {
+                m_SessionObjectKey = value;
+            }
+        }
+
+        #endregion
+
+        #region IHttpModule Implementation
+
+        public void Init(HttpApplication context)
+        {
+            m_HttpApplication = context;
+            m_HttpApplication.PreRequestHandlerExecute += new EventHandler(OnPreRequestHandlerExecute);
+        }
+
+        public void Dispose()
+        {
+            // Do Nothing
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Event raised when the session ends
+        /// </summary>
+        public static event SessionEndEventHandler SessionEnd;
+
+        #endregion
+
+        private void OnPreRequestHandlerExecute(object sender, EventArgs e)
+        {
+            // We only want to update the session when an ASPX page is being viewed
+            // We're also doing this in the PreRequestHandler, as doing it elsewhere
+            // (like the PostRequestHandler) can cause some strange behaviour.
+
+            if (Path.GetExtension(m_HttpApplication.Context.Request.Path).ToLower() == ".aspx")
+            {
+                // Ensure we have a HttpContext
+                if (HttpContext.Current == null)
+                {
+                    Debug.WriteLine("No current http context");
+                    return;
+                }
+
+                // Get the current session
+                HttpSessionState currentSession = HttpContext.Current.Session;
+
+                // Ensure we have a current session
+                if (currentSession == null)
+                {
+                    Debug.WriteLine("No current session");
+                    return;
+                }
+
+                // Get the session timeout
+                TimeSpan sessionTimeout = new TimeSpan(0, 0, currentSession.Timeout, 0, 0);
+
+                // Get the object in the session we want to retrieve when the session times out
+                object sessionObject = currentSession[SessionObjectKey];
+
+                // Add the object to the cache with the current session id, and set a cache removal callback method
+                HttpContext.Current.Cache.Insert(currentSession.SessionID, sessionObject, null, DateTime.MaxValue, sessionTimeout, CacheItemPriority.NotRemovable, CacheItemRemovedCallbackMethod);
+            }
+        }
+
+        /// <summary>
+        /// This method is fired when an item is removed from the cache.  It is used to detect when a cache item
+        /// expires, indicating that the session has expired, and fires the SessionEnd event.
+        /// </summary>
+        private void CacheItemRemovedCallbackMethod(string key, object value, CacheItemRemovedReason reason)
+        {
+            if (reason == CacheItemRemovedReason.Expired)
+            {
+                if (SessionEnd != null)
+                {
+                     SessionEndedEventArgs e = new SessionEndedEventArgs(key, value);
+                     SessionEnd(this, e);
+                     
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Event handler for handling the SessionEnd event
+    /// </summary>
+    public delegate void SessionEndEventHandler(object sender, SessionEndedEventArgs e);
+
+    /// <summary>
+    /// SessionEndedEventArgs for use in the SessionEnd event
+    /// </summary>
+    public class SessionEndedEventArgs : EventArgs
+    {
+        public readonly string SessionId;
+        public readonly object SessionObject;
+
+        public SessionEndedEventArgs(string sessionId, object sessionObject)
+        {   
+            SessionId = sessionId;
+            SessionObject = sessionObject;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Bin/AjaxControlToolkit.dll b/Bin/AjaxControlToolkit.dll
new file mode 100644
index 0000000..4fbcfc9
Binary files /dev/null and b/Bin/AjaxControlToolkit.dll differ
diff --git a/Bin/AjaxControlToolkit.dll.refresh b/Bin/AjaxControlToolkit.dll.refresh
new file mode 100644
index 0000000..3c4c615
Binary files /dev/null and b/Bin/AjaxControlToolkit.dll.refresh differ
diff --git a/Bin/App_Code/.svn/entries b/Bin/App_Code/.svn/entries
new file mode 100644
index 0000000..c0dedaf
--- /dev/null
+++ b/Bin/App_Code/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/App_Code
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+PagePublic.cs
+file
+
+
+
+
+2011-04-01T02:51:10.289868Z
+88adefccb355a757a198d9d5710b8905
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+637
+
+ExcelExp.cs
+file
+
+
+
+
+2011-04-01T02:51:10.305493Z
+622cd19125108d2405c68fbaa5dd594a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1888
+
+SessionEndModule.cs
+file
+
+
+
+
+2011-04-01T02:51:10.305493Z
+afc00bfe8b5a4c00a5defa6a1221b0fb
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5243
+
+PageBase.cs
+file
+
+
+
+
+2011-04-01T02:51:10.321118Z
+ada92b7d54cfb24aba200636f6b94af8
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2850
+
diff --git a/Bin/App_Code/.svn/text-base/ExcelExp.cs.svn-base b/Bin/App_Code/.svn/text-base/ExcelExp.cs.svn-base
new file mode 100644
index 0000000..118e6ca
--- /dev/null
+++ b/Bin/App_Code/.svn/text-base/ExcelExp.cs.svn-base
@@ -0,0 +1,55 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// utils 的摘要说明
+    /// </summary>
+    public class ExcelExp
+    {
+        public ExcelExp()
+        {
+            //
+            // TODO: 在此处添加构造函数逻辑
+            //
+        }
+
+ 
+        public static void Export(GridView GridView1, DataView dv ,ScriptManager sm,Control Button1,string fileName, Page page )
+        {
+             sm.RegisterPostBackControl(Button1);
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            
+           
+            HttpContext.Current.Response.Charset = "GB2312";
+            HttpContext.Current.Response.ContentEncoding = Encoding.UTF7;
+            HttpContext.Current.Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(fileName + ".xls", Encoding.UTF8).ToString());
+            HttpContext.Current.Response.ContentType = "application/ms-excel";
+            page.EnableViewState = false;
+            StringWriter tw = new StringWriter();
+            HtmlTextWriter hw = new HtmlTextWriter(tw);
+            GridView1.RenderControl(hw);
+            HttpContext.Current.Response.Write(tw.ToString());
+            HttpContext.Current.Response.End();
+
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Bin/App_Code/.svn/text-base/PageBase.cs.svn-base b/Bin/App_Code/.svn/text-base/PageBase.cs.svn-base
new file mode 100644
index 0000000..8245cc0
--- /dev/null
+++ b/Bin/App_Code/.svn/text-base/PageBase.cs.svn-base
@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using ZhangPu.Gov.Logical;
+
+/// <summary>
+/// utils 的摘要说明
+/// </summary>
+public class PageBase : PagePublic
+{
+    public PageBase()
+    {
+      
+    }
+
+
+     
+ //　protected LEmployee lem;
+ //  const string DefaultPage = "~/index.aspx";
+ //  const string HomePage = "~/Desktop.aspx";
+
+    public void CheckAuthority()
+    {
+        if (checkCloseIE()) return;
+
+        string requestPage = Request.AppRelativeCurrentExecutionFilePath + Request.Url.Query;
+        requestPage = requestPage.ToUpper();
+        //   if (DefaultPage.Equals(requestPage)) return;  //起始页不做判断
+        if (DefaultPage.ToUpper() == requestPage) return; //起始页不做判断
+
+        if (lem == null)
+        {
+            logobj.LoginLog(string.Empty,"lem is null");
+            Response.Redirect(DefaultPage);
+        }
+        if (HomePage.ToUpper() == requestPage) return;
+        if (lem.GetEmployee.em_account == "Root") //内建管理员
+        {
+
+            return;
+        }
+
+        if (lem.AuthList.Contains(requestPage)) return;
+        if (!new LRoleAuthority().GetPublicAuthorityList().Contains(requestPage))
+        {
+            logobj.RequestPageLog();
+            
+            logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
+            
+            Response.Redirect(DefaultPage);
+        }
+
+    }
+
+    protected override void OnPreInit(EventArgs e)
+      {
+       
+        base.OnPreInit(e);
+      
+        CheckAuthority(); 
+        
+      }
+    bool checkCloseIE()
+    {
+        if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+        {
+            string cmd = Request.QueryString["___command"];
+            if (cmd == "ClearSession")
+            {
+                if ((Session["CurrentUser"] != null))
+                {
+
+                    if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                        if (Session["CurrentUserId"] != null)
+                        {
+                            //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            myLog.RequestLog logobj = new myLog.RequestLog();
+                            logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                }
+                Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                return true;
+            }
+        }
+        return false;
+    }
+ 
+}
diff --git a/Bin/App_Code/.svn/text-base/PagePublic.cs.svn-base b/Bin/App_Code/.svn/text-base/PagePublic.cs.svn-base
new file mode 100644
index 0000000..f64f45c
--- /dev/null
+++ b/Bin/App_Code/.svn/text-base/PagePublic.cs.svn-base
@@ -0,0 +1,26 @@
+using System;
+using System.Web.UI;
+using ZhangPu.Gov.Logical;
+
+/// <summary>
+/// PagePublic 的摘要说明
+/// </summary>
+public class PagePublic : Page
+{
+    protected LEmployee lem;
+    protected const string DefaultPage = "~/index.aspx";
+    protected const string HomePage = "~/Desktop.aspx";
+    protected myLog.RequestLog logobj;
+    public PagePublic()
+    {
+   　
+    }
+    protected override void OnPreInit(EventArgs e)
+    {
+      　 lem = (LEmployee)Session["CurrentUser"];
+      　
+        base.OnPreInit(e);
+         logobj = new myLog.RequestLog();
+        logobj.RequestPageLog();
+    }
+}
diff --git a/Bin/App_Code/.svn/text-base/SessionEndModule.cs.svn-base b/Bin/App_Code/.svn/text-base/SessionEndModule.cs.svn-base
new file mode 100644
index 0000000..328a35b
--- /dev/null
+++ b/Bin/App_Code/.svn/text-base/SessionEndModule.cs.svn-base
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+ 
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+using System.Web.UI;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// When an ASP.NET State Server other than InProc, the Session_End event
+    /// does not get fired.  This is an HttpModule which uses some workarounds
+    /// and fires a static event when a session ends, with the value of a single
+    /// configurable session variable in the event arguments.
+    /// </summary>
+    public class SessionEndModule : IHttpModule
+    {
+        #region Private Variables
+
+        private HttpApplication m_HttpApplication;
+        private static string m_SessionObjectKey;
+
+        #endregion
+
+        #region Accessors
+
+        /// <summary>
+        /// This is the key of the item in the session which should be returned
+        /// in the SessionEnd event (as the SessionObject).
+        /// </summary>
+        /// <example>
+        ///	If you're storing the user ID in the session, under a key called 'UserId'
+        /// and need to do something with it in the SessionEnd event, you would set
+        /// this to 'UserId', which would cause the value of the session key called
+        /// 'UserId' to be returned.
+        /// </example>
+        public static string SessionObjectKey
+        {
+            get
+            {
+                return m_SessionObjectKey;
+            }
+            set
+            {
+                m_SessionObjectKey = value;
+            }
+        }
+
+        #endregion
+
+        #region IHttpModule Implementation
+
+        public void Init(HttpApplication context)
+        {
+            m_HttpApplication = context;
+            m_HttpApplication.PreRequestHandlerExecute += new EventHandler(OnPreRequestHandlerExecute);
+        }
+
+        public void Dispose()
+        {
+            // Do Nothing
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Event raised when the session ends
+        /// </summary>
+        public static event SessionEndEventHandler SessionEnd;
+
+        #endregion
+
+        private void OnPreRequestHandlerExecute(object sender, EventArgs e)
+        {
+            // We only want to update the session when an ASPX page is being viewed
+            // We're also doing this in the PreRequestHandler, as doing it elsewhere
+            // (like the PostRequestHandler) can cause some strange behaviour.
+
+            if (Path.GetExtension(m_HttpApplication.Context.Request.Path).ToLower() == ".aspx")
+            {
+                // Ensure we have a HttpContext
+                if (HttpContext.Current == null)
+                {
+                    Debug.WriteLine("No current http context");
+                    return;
+                }
+
+                // Get the current session
+                HttpSessionState currentSession = HttpContext.Current.Session;
+
+                // Ensure we have a current session
+                if (currentSession == null)
+                {
+                    Debug.WriteLine("No current session");
+                    return;
+                }
+
+                // Get the session timeout
+                TimeSpan sessionTimeout = new TimeSpan(0, 0, currentSession.Timeout, 0, 0);
+
+                // Get the object in the session we want to retrieve when the session times out
+                object sessionObject = currentSession[SessionObjectKey];
+
+                // Add the object to the cache with the current session id, and set a cache removal callback method
+                HttpContext.Current.Cache.Insert(currentSession.SessionID, sessionObject, null, DateTime.MaxValue, sessionTimeout, CacheItemPriority.NotRemovable, CacheItemRemovedCallbackMethod);
+            }
+        }
+
+        /// <summary>
+        /// This method is fired when an item is removed from the cache.  It is used to detect when a cache item
+        /// expires, indicating that the session has expired, and fires the SessionEnd event.
+        /// </summary>
+        private void CacheItemRemovedCallbackMethod(string key, object value, CacheItemRemovedReason reason)
+        {
+            if (reason == CacheItemRemovedReason.Expired)
+            {
+                if (SessionEnd != null)
+                {
+                     SessionEndedEventArgs e = new SessionEndedEventArgs(key, value);
+                     SessionEnd(this, e);
+                     
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Event handler for handling the SessionEnd event
+    /// </summary>
+    public delegate void SessionEndEventHandler(object sender, SessionEndedEventArgs e);
+
+    /// <summary>
+    /// SessionEndedEventArgs for use in the SessionEnd event
+    /// </summary>
+    public class SessionEndedEventArgs : EventArgs
+    {
+        public readonly string SessionId;
+        public readonly object SessionObject;
+
+        public SessionEndedEventArgs(string sessionId, object sessionObject)
+        {   
+            SessionId = sessionId;
+            SessionObject = sessionObject;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Bin/App_Code/ExcelExp.cs b/Bin/App_Code/ExcelExp.cs
new file mode 100644
index 0000000..118e6ca
--- /dev/null
+++ b/Bin/App_Code/ExcelExp.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// utils 的摘要说明
+    /// </summary>
+    public class ExcelExp
+    {
+        public ExcelExp()
+        {
+            //
+            // TODO: 在此处添加构造函数逻辑
+            //
+        }
+
+ 
+        public static void Export(GridView GridView1, DataView dv ,ScriptManager sm,Control Button1,string fileName, Page page )
+        {
+             sm.RegisterPostBackControl(Button1);
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            
+           
+            HttpContext.Current.Response.Charset = "GB2312";
+            HttpContext.Current.Response.ContentEncoding = Encoding.UTF7;
+            HttpContext.Current.Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(fileName + ".xls", Encoding.UTF8).ToString());
+            HttpContext.Current.Response.ContentType = "application/ms-excel";
+            page.EnableViewState = false;
+            StringWriter tw = new StringWriter();
+            HtmlTextWriter hw = new HtmlTextWriter(tw);
+            GridView1.RenderControl(hw);
+            HttpContext.Current.Response.Write(tw.ToString());
+            HttpContext.Current.Response.End();
+
+            GridView1.AllowPaging = false;
+            GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Bin/App_Code/PageBase.cs b/Bin/App_Code/PageBase.cs
new file mode 100644
index 0000000..dd223b1
--- /dev/null
+++ b/Bin/App_Code/PageBase.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using DeiNiu.wms.Logical;
+
+/// <summary>
+/// utils 的摘要说明
+/// </summary>
+public class PageBase : PagePublic
+{
+    public PageBase()
+    {
+      
+    }
+
+
+     
+ //　protected LEmployee lem;
+ //  const string DefaultPage = "~/index.aspx";
+ //  const string HomePage = "~/Desktop.aspx";
+
+    public void CheckAuthority()
+    {
+        if (checkCloseIE()) return;
+
+        string requestPage = Request.AppRelativeCurrentExecutionFilePath + Request.Url.Query;
+        requestPage = requestPage.ToUpper();
+        //   if (DefaultPage.Equals(requestPage)) return;  //起始页不做判断
+        if (DefaultPage.ToUpper() == requestPage) return; //起始页不做判断
+
+        if (lem == null)
+        {
+            logobj.LoginLog(string.Empty,"lem is null");
+            Response.Redirect(DefaultPage);
+        }
+        if (HomePage.ToUpper() == requestPage) return;
+        if (lem.GetEmployee.em_account == "Root") //内建管理员
+        {
+
+            return;
+        }
+
+        if (lem.AuthList.Contains(requestPage)) return;
+        if (!new LRoleAuthority().GetPublicAuthorityList().Contains(requestPage))
+        {
+            logobj.RequestPageLog();
+            
+            logobj.LoginLog(lem.GetEmployee.em_account ,"NoAccess!");
+            
+            Response.Redirect(DefaultPage);
+        }
+
+    }
+
+    protected override void OnPreInit(EventArgs e)
+      {
+       
+        base.OnPreInit(e);
+      
+        CheckAuthority(); 
+        
+      }
+    bool checkCloseIE()
+    {
+        if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+        {
+            string cmd = Request.QueryString["___command"];
+            if (cmd == "ClearSession")
+            {
+                if ((Session["CurrentUser"] != null))
+                {
+
+                    if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                        if (Session["CurrentUserId"] != null)
+                        {
+                            //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                            logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                }
+                Session.Abandon(); //清空Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                return true;
+            }
+        }
+        return false;
+    }
+ 
+}
diff --git a/Bin/App_Code/PagePublic.cs b/Bin/App_Code/PagePublic.cs
new file mode 100644
index 0000000..5fee555
--- /dev/null
+++ b/Bin/App_Code/PagePublic.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Web.UI;
+using DeiNiu.wms.Logical;
+
+/// <summary>
+/// PagePublic 的摘要说明
+/// </summary>
+public class PagePublic : Page
+{
+    protected LEmployee lem;
+    protected const string DefaultPage = "~/index.aspx";
+    protected const string HomePage = "~/Desktop.aspx";
+    protected DeiNiu.RequestLog logobj;
+    public PagePublic()
+    {
+   　
+    }
+    protected override void OnPreInit(EventArgs e)
+    {
+      　 lem = (LEmployee)Session["CurrentUser"];
+      　
+        base.OnPreInit(e);
+         logobj = new DeiNiu.RequestLog();
+        logobj.RequestPageLog();
+    }
+}
diff --git a/Bin/App_Code/SessionEndModule.cs b/Bin/App_Code/SessionEndModule.cs
new file mode 100644
index 0000000..328a35b
--- /dev/null
+++ b/Bin/App_Code/SessionEndModule.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+ 
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+using System.Web.UI;
+
+namespace view.App_Code
+{
+    /// <summary>
+    /// When an ASP.NET State Server other than InProc, the Session_End event
+    /// does not get fired.  This is an HttpModule which uses some workarounds
+    /// and fires a static event when a session ends, with the value of a single
+    /// configurable session variable in the event arguments.
+    /// </summary>
+    public class SessionEndModule : IHttpModule
+    {
+        #region Private Variables
+
+        private HttpApplication m_HttpApplication;
+        private static string m_SessionObjectKey;
+
+        #endregion
+
+        #region Accessors
+
+        /// <summary>
+        /// This is the key of the item in the session which should be returned
+        /// in the SessionEnd event (as the SessionObject).
+        /// </summary>
+        /// <example>
+        ///	If you're storing the user ID in the session, under a key called 'UserId'
+        /// and need to do something with it in the SessionEnd event, you would set
+        /// this to 'UserId', which would cause the value of the session key called
+        /// 'UserId' to be returned.
+        /// </example>
+        public static string SessionObjectKey
+        {
+            get
+            {
+                return m_SessionObjectKey;
+            }
+            set
+            {
+                m_SessionObjectKey = value;
+            }
+        }
+
+        #endregion
+
+        #region IHttpModule Implementation
+
+        public void Init(HttpApplication context)
+        {
+            m_HttpApplication = context;
+            m_HttpApplication.PreRequestHandlerExecute += new EventHandler(OnPreRequestHandlerExecute);
+        }
+
+        public void Dispose()
+        {
+            // Do Nothing
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Event raised when the session ends
+        /// </summary>
+        public static event SessionEndEventHandler SessionEnd;
+
+        #endregion
+
+        private void OnPreRequestHandlerExecute(object sender, EventArgs e)
+        {
+            // We only want to update the session when an ASPX page is being viewed
+            // We're also doing this in the PreRequestHandler, as doing it elsewhere
+            // (like the PostRequestHandler) can cause some strange behaviour.
+
+            if (Path.GetExtension(m_HttpApplication.Context.Request.Path).ToLower() == ".aspx")
+            {
+                // Ensure we have a HttpContext
+                if (HttpContext.Current == null)
+                {
+                    Debug.WriteLine("No current http context");
+                    return;
+                }
+
+                // Get the current session
+                HttpSessionState currentSession = HttpContext.Current.Session;
+
+                // Ensure we have a current session
+                if (currentSession == null)
+                {
+                    Debug.WriteLine("No current session");
+                    return;
+                }
+
+                // Get the session timeout
+                TimeSpan sessionTimeout = new TimeSpan(0, 0, currentSession.Timeout, 0, 0);
+
+                // Get the object in the session we want to retrieve when the session times out
+                object sessionObject = currentSession[SessionObjectKey];
+
+                // Add the object to the cache with the current session id, and set a cache removal callback method
+                HttpContext.Current.Cache.Insert(currentSession.SessionID, sessionObject, null, DateTime.MaxValue, sessionTimeout, CacheItemPriority.NotRemovable, CacheItemRemovedCallbackMethod);
+            }
+        }
+
+        /// <summary>
+        /// This method is fired when an item is removed from the cache.  It is used to detect when a cache item
+        /// expires, indicating that the session has expired, and fires the SessionEnd event.
+        /// </summary>
+        private void CacheItemRemovedCallbackMethod(string key, object value, CacheItemRemovedReason reason)
+        {
+            if (reason == CacheItemRemovedReason.Expired)
+            {
+                if (SessionEnd != null)
+                {
+                     SessionEndedEventArgs e = new SessionEndedEventArgs(key, value);
+                     SessionEnd(this, e);
+                     
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Event handler for handling the SessionEnd event
+    /// </summary>
+    public delegate void SessionEndEventHandler(object sender, SessionEndedEventArgs e);
+
+    /// <summary>
+    /// SessionEndedEventArgs for use in the SessionEnd event
+    /// </summary>
+    public class SessionEndedEventArgs : EventArgs
+    {
+        public readonly string SessionId;
+        public readonly object SessionObject;
+
+        public SessionEndedEventArgs(string sessionId, object sessionObject)
+        {   
+            SessionId = sessionId;
+            SessionObject = sessionObject;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Bin/App_Licenses.dll b/Bin/App_Licenses.dll
new file mode 100644
index 0000000..24e0393
Binary files /dev/null and b/Bin/App_Licenses.dll differ
diff --git a/Bin/BaseObject.dll b/Bin/BaseObject.dll
new file mode 100644
index 0000000..cf707a2
Binary files /dev/null and b/Bin/BaseObject.dll differ
diff --git a/Bin/BaseObject.pdb b/Bin/BaseObject.pdb
new file mode 100644
index 0000000..d25c6ec
Binary files /dev/null and b/Bin/BaseObject.pdb differ
diff --git a/Bin/DevExpress.Charts.v16.2.Core.dll b/Bin/DevExpress.Charts.v16.2.Core.dll
new file mode 100644
index 0000000..cda848a
Binary files /dev/null and b/Bin/DevExpress.Charts.v16.2.Core.dll differ
diff --git a/Bin/DevExpress.Data.v16.2.dll b/Bin/DevExpress.Data.v16.2.dll
new file mode 100644
index 0000000..f84bb55
Binary files /dev/null and b/Bin/DevExpress.Data.v16.2.dll differ
diff --git a/Bin/DevExpress.Printing.v16.2.Core.dll b/Bin/DevExpress.Printing.v16.2.Core.dll
new file mode 100644
index 0000000..ac66d44
Binary files /dev/null and b/Bin/DevExpress.Printing.v16.2.Core.dll differ
diff --git a/Bin/DevExpress.Web.v16.2.dll b/Bin/DevExpress.Web.v16.2.dll
new file mode 100644
index 0000000..5d8359d
Binary files /dev/null and b/Bin/DevExpress.Web.v16.2.dll differ
diff --git a/Bin/DevExpress.XtraCharts.v16.2.Web.dll b/Bin/DevExpress.XtraCharts.v16.2.Web.dll
new file mode 100644
index 0000000..4c60a2b
Binary files /dev/null and b/Bin/DevExpress.XtraCharts.v16.2.Web.dll differ
diff --git a/Bin/DevExpress.XtraCharts.v16.2.dll b/Bin/DevExpress.XtraCharts.v16.2.dll
new file mode 100644
index 0000000..6e3d0af
Binary files /dev/null and b/Bin/DevExpress.XtraCharts.v16.2.dll differ
diff --git a/Bin/LitJSON.dll b/Bin/LitJSON.dll
new file mode 100644
index 0000000..9cc439d
Binary files /dev/null and b/Bin/LitJSON.dll differ
diff --git a/Bin/LitJSON.dll.refresh b/Bin/LitJSON.dll.refresh
new file mode 100644
index 0000000..53793ef
Binary files /dev/null and b/Bin/LitJSON.dll.refresh differ
diff --git a/Bin/Logical.dll b/Bin/Logical.dll
new file mode 100644
index 0000000..b1f2277
Binary files /dev/null and b/Bin/Logical.dll differ
diff --git a/Bin/Logical.pdb b/Bin/Logical.pdb
new file mode 100644
index 0000000..36c1593
Binary files /dev/null and b/Bin/Logical.pdb differ
diff --git a/Bin/Model.dll b/Bin/Model.dll
new file mode 100644
index 0000000..2f14946
Binary files /dev/null and b/Bin/Model.dll differ
diff --git a/Bin/Model.pdb b/Bin/Model.pdb
new file mode 100644
index 0000000..d1284d6
Binary files /dev/null and b/Bin/Model.pdb differ
diff --git a/Bin/Utils.dll b/Bin/Utils.dll
new file mode 100644
index 0000000..b1b97aa
Binary files /dev/null and b/Bin/Utils.dll differ
diff --git a/Bin/Utils.pdb b/Bin/Utils.pdb
new file mode 100644
index 0000000..179022f
Binary files /dev/null and b/Bin/Utils.pdb differ
diff --git a/Bin/log4net.dll b/Bin/log4net.dll
new file mode 100644
index 0000000..a4af9d6
Binary files /dev/null and b/Bin/log4net.dll differ
diff --git a/Bin/log4net.pdb b/Bin/log4net.pdb
new file mode 100644
index 0000000..4ec3e46
Binary files /dev/null and b/Bin/log4net.pdb differ
diff --git a/Bin/log4net.xml b/Bin/log4net.xml
new file mode 100644
index 0000000..df56743
--- /dev/null
+++ b/Bin/log4net.xml
@@ -0,0 +1,32464 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>log4net</name>
+    </assembly>
+    <members>
+        <member name="T:log4net.Appender.AdoNetAppender">
+            <summary>
+            Appender that logs to a database.
+            </summary>
+            <remarks>
+            <para>
+            <see cref="T:log4net.Appender.AdoNetAppender"/> appends logging events to a table within a
+            database. The appender can be configured to specify the connection 
+            string by setting the <see cref="P:log4net.Appender.AdoNetAppender.ConnectionString"/> property. 
+            The connection type (provider) can be specified by setting the <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/>
+            property. For more information on database connection strings for
+            your specific database see <a href="http://www.connectionstrings.com/">http://www.connectionstrings.com/</a>.
+            </para>
+            <para>
+            Records are written into the database either using a prepared
+            statement or a stored procedure. The <see cref="P:log4net.Appender.AdoNetAppender.CommandType"/> property
+            is set to <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>) to specify a prepared statement
+            or to <see cref="F:System.Data.CommandType.StoredProcedure"/> (<c>System.Data.CommandType.StoredProcedure</c>) to specify a stored
+            procedure.
+            </para>
+            <para>
+            The prepared statement text or the name of the stored procedure
+            must be set in the <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> property.
+            </para>
+            <para>
+            The prepared statement or stored procedure can take a number
+            of parameters. Parameters are added using the <see cref="M:log4net.Appender.AdoNetAppender.AddParameter(log4net.Appender.AdoNetAppenderParameter)"/>
+            method. This adds a single <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> to the
+            ordered list of parameters. The <see cref="T:log4net.Appender.AdoNetAppenderParameter"/>
+            type may be subclassed if required to provide database specific
+            functionality. The <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> specifies
+            the parameter name, database type, size, and how the value should
+            be generated using a <see cref="T:log4net.Layout.ILayout"/>.
+            </para>
+            </remarks>
+            <example>
+            An example of a SQL Server table that could be logged to:
+            <code lang="SQL">
+            CREATE TABLE [dbo].[Log] ( 
+              [ID] [int] IDENTITY (1, 1) NOT NULL ,
+              [Date] [datetime] NOT NULL ,
+              [Thread] [varchar] (255) NOT NULL ,
+              [Level] [varchar] (20) NOT NULL ,
+              [Logger] [varchar] (255) NOT NULL ,
+              [Message] [varchar] (4000) NOT NULL 
+            ) ON [PRIMARY]
+            </code>
+            </example>
+            <example>
+            An example configuration to log to the above table:
+            <code lang="XML" escaped="true">
+            <appender name="AdoNetAppender_SqlServer" type="log4net.Appender.AdoNetAppender">
+              <connectionType value="System.Data.SqlClient.SqlConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+              <connectionString value="data source=SQLSVR;initial catalog=test_log4net;integrated security=false;persist security info=True;User ID=sa;Password=sa"/>
+              <commandText value="INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message]) VALUES (@log_date, @thread, @log_level, @logger, @message)"/>
+              <parameter>
+                <parameterName value="@log_date"/>
+                <dbType value="DateTime"/>
+                <layout type="log4net.Layout.PatternLayout" value="%date{yyyy'-'MM'-'dd HH':'mm':'ss'.'fff}"/>
+              </parameter>
+              <parameter>
+                <parameterName value="@thread"/>
+                <dbType value="String"/>
+                <size value="255"/>
+                <layout type="log4net.Layout.PatternLayout" value="%thread"/>
+              </parameter>
+              <parameter>
+                <parameterName value="@log_level"/>
+                <dbType value="String"/>
+                <size value="50"/>
+                <layout type="log4net.Layout.PatternLayout" value="%level"/>
+              </parameter>
+              <parameter>
+                <parameterName value="@logger"/>
+                <dbType value="String"/>
+                <size value="255"/>
+                <layout type="log4net.Layout.PatternLayout" value="%logger"/>
+              </parameter>
+              <parameter>
+                <parameterName value="@message"/>
+                <dbType value="String"/>
+                <size value="4000"/>
+                <layout type="log4net.Layout.PatternLayout" value="%message"/>
+              </parameter>
+            </appender>
+            </code>
+            </example>
+            <author>Julian Biddle</author>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Lance Nehring</author>
+        </member>
+        <member name="T:log4net.Appender.BufferingAppenderSkeleton">
+            <summary>
+            Abstract base class implementation of <see cref="T:log4net.Appender.IAppender"/> that 
+            buffers events in a fixed size buffer.
+            </summary>
+            <remarks>
+            <para>
+            This base class should be used by appenders that need to buffer a 
+            number of events before logging them. For example the <see cref="T:log4net.Appender.AdoNetAppender"/> 
+            buffers events and then submits the entire contents of the buffer to 
+            the underlying database in one go.
+            </para>
+            <para>
+            Subclasses should override the <see cref="M:SendBuffer(LoggingEvent[])"/>
+            method to deliver the buffered events.
+            </para>
+            <para>The BufferingAppenderSkeleton maintains a fixed size cyclic 
+            buffer of events. The size of the buffer is set using 
+            the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> property.
+            </para>
+            <para>A <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> is used to inspect 
+            each event as it arrives in the appender. If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> 
+            triggers, then the current buffer is sent immediately 
+            (see <see cref="M:SendBuffer(LoggingEvent[])"/>). Otherwise the event 
+            is stored in the buffer. For example, an evaluator can be used to 
+            deliver the events immediately when an ERROR event arrives.
+            </para>
+            <para>
+            The buffering appender can be configured in a <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode. 
+            By default the appender is NOT lossy. When the buffer is full all 
+            the buffered events are sent with <see cref="M:SendBuffer(LoggingEvent[])"/>.
+            If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> property is set to <c>true</c> then the 
+            buffer will not be sent when it is full, and new events arriving 
+            in the appender will overwrite the oldest event in the buffer. 
+            In lossy mode the buffer will only be sent when the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/>
+            triggers. This can be useful behavior when you need to know about 
+            ERROR events but not about events with a lower level, configure an 
+            evaluator that will trigger when an ERROR event arrives, the whole 
+            buffer will be sent which gives a history of events leading up to
+            the ERROR event.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Appender.AppenderSkeleton">
+            <summary>
+            Abstract base class implementation of <see cref="T:log4net.Appender.IAppender"/>. 
+            </summary>
+            <remarks>
+            <para>
+            This class provides the code for common functionality, such 
+            as support for threshold filtering and support for general filters.
+            </para>
+            <para>
+            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
+            they would require that the <see cref="M:IOptionHandler.ActivateOptions()"/> method
+            be called after the appenders properties have been configured.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Appender.IAppender">
+            <summary>
+            Implement this interface for your own strategies for printing log statements.
+            </summary>
+            <remarks>
+            <para>
+            Implementors should consider extending the <see cref="T:log4net.Appender.AppenderSkeleton"/>
+            class which provides a default implementation of this interface.
+            </para>
+            <para>
+            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
+            they would require that the <see cref="M:IOptionHandler.ActivateOptions()"/> method
+            be called after the appenders properties have been configured.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Appender.IAppender.Close">
+            <summary>
+            Closes the appender and releases resources.
+            </summary>
+            <remarks>
+            <para>
+            Releases any resources allocated within the appender such as file handles, 
+            network connections, etc.
+            </para>
+            <para>
+            It is a programming error to append to a closed appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)">
+            <summary>
+            Log the logging event in Appender specific way.
+            </summary>
+            <param name="loggingEvent">The event to log</param>
+            <remarks>
+            <para>
+            This method is called to log a message into this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.IAppender.Name">
+            <summary>
+            Gets or sets the name of this appender.
+            </summary>
+            <value>The name of the appender.</value>
+            <remarks>
+            <para>The name uniquely identifies the appender.</para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.IBulkAppender">
+            <summary>
+            Interface for appenders that support bulk logging.
+            </summary>
+            <remarks>
+            <para>
+            This interface extends the <see cref="T:log4net.Appender.IAppender"/> interface to
+            support bulk logging of <see cref="T:log4net.Core.LoggingEvent"/> objects. Appenders
+            should only implement this interface if they can bulk log efficiently.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.IBulkAppender.DoAppend(log4net.Core.LoggingEvent[])">
+            <summary>
+            Log the array of logging events in Appender specific way.
+            </summary>
+            <param name="loggingEvents">The events to log</param>
+            <remarks>
+            <para>
+            This method is called to log an array of events into this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.IOptionHandler">
+            <summary>
+            Interface used to delay activate a configured object.
+            </summary>
+            <remarks>
+            <para>
+            This allows an object to defer activation of its options until all
+            options have been set. This is required for components which have
+            related options that remain ambiguous until all are set.
+            </para>
+            <para>
+            If a component implements this interface then the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions"/> method 
+            must be called by the container after its all the configured properties have been set 
+            and before the component can be used.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Core.IOptionHandler.ActivateOptions">
+            <summary>
+            Activate the options that were previously set with calls to properties.
+            </summary>
+            <remarks>
+            <para>
+            This allows an object to defer activation of its options until all
+            options have been set. This is required for components which have
+            related options that remain ambiguous until all are set.
+            </para>
+            <para>
+            If a component implements this interface then this method must be called
+            after its properties have been set before the component can be used.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.IFlushable">
+            <summary>
+            Interface that can be implemented by Appenders that buffer logging data and expose a <see cref="M:log4net.Appender.IFlushable.Flush(System.Int32)"/> method.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.IFlushable.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <remarks>
+            Appenders that implement the <see cref="M:log4net.Appender.IFlushable.Flush(System.Int32)"/> method must do so in a thread-safe manner: it can be called concurrently with
+            the <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method.
+            <para>
+            Typically this is done by locking on the Appender instance, e.g.:
+            <code>
+            <![CDATA[
+            public bool Flush(int millisecondsTimeout)
+            {
+                lock(this)
+                {
+                    // Flush buffered logging data
+                    ...
+                }
+            }
+            ]]>
+            </code>
+            </para>
+            <para>
+            The <paramref name="millisecondsTimeout"/> parameter is only relevant for appenders that process logging events asynchronously,
+            such as <see cref="T:log4net.Appender.RemotingAppender"/>.
+            </para>
+            </remarks>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.c_renderBufferSize">
+            <summary>
+            Initial buffer size
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.c_renderBufferMaxCapacity">
+            <summary>
+            Maximum buffer size before it is recycled
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>Empty default constructor</para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.Finalize">
+            <summary>
+            Finalizes this appender by calling the implementation's 
+            <see cref="M:log4net.Appender.AppenderSkeleton.Close"/> method.
+            </summary>
+            <remarks>
+            <para>
+            If this appender has not been closed then the <c>Finalize</c> method
+            will call <see cref="M:log4net.Appender.AppenderSkeleton.Close"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.Close">
+            <summary>
+            Closes the appender and release resources.
+            </summary>
+            <remarks>
+            <para>
+            Release any resources allocated within the appender such as file handles, 
+            network connections, etc.
+            </para>
+            <para>
+            It is a programming error to append to a closed appender.
+            </para>
+            <para>
+            This method cannot be overridden by subclasses. This method 
+            delegates the closing of the appender to the <see cref="M:log4net.Appender.AppenderSkeleton.OnClose"/>
+            method which must be overridden in the subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)">
+            <summary>
+            Performs threshold checks and invokes filters before 
+            delegating actual logging to the subclasses specific 
+            <see cref="M:Append(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            This method cannot be overridden by derived classes. A
+            derived class should override the <see cref="M:Append(LoggingEvent)"/> method
+            which is called by this method.
+            </para>
+            <para>
+            The implementation of this method is as follows:
+            </para>
+            <para>
+            <list type="bullet">
+            	<item>
+            		<description>
+            		Checks that the severity of the <paramref name="loggingEvent"/>
+            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
+            		appender.</description>
+            	</item>
+            	<item>
+            		<description>
+            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
+            		<paramref name="loggingEvent"/>.
+            		</description>
+            	</item>
+            	<item>
+            		<description>
+            		Calls <see cref="M:PreAppendCheck()"/> and checks that 
+            		it returns <c>true</c>.</description>
+            	</item>
+            </list>
+            </para>
+            <para>
+            If all of the above steps succeed then the <paramref name="loggingEvent"/>
+            will be passed to the abstract <see cref="M:Append(LoggingEvent)"/> method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent[])">
+            <summary>
+            Performs threshold checks and invokes filters before 
+            delegating actual logging to the subclasses specific 
+            <see cref="M:Append(LoggingEvent[])"/> method.
+            </summary>
+            <param name="loggingEvents">The array of events to log.</param>
+            <remarks>
+            <para>
+            This method cannot be overridden by derived classes. A
+            derived class should override the <see cref="M:Append(LoggingEvent[])"/> method
+            which is called by this method.
+            </para>
+            <para>
+            The implementation of this method is as follows:
+            </para>
+            <para>
+            <list type="bullet">
+            	<item>
+            		<description>
+            		Checks that the severity of the <paramref name="loggingEvents"/>
+            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
+            		appender.</description>
+            	</item>
+            	<item>
+            		<description>
+            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
+            		<paramref name="loggingEvents"/>.
+            		</description>
+            	</item>
+            	<item>
+            		<description>
+            		Calls <see cref="M:PreAppendCheck()"/> and checks that 
+            		it returns <c>true</c>.</description>
+            	</item>
+            </list>
+            </para>
+            <para>
+            If all of the above steps succeed then the <paramref name="loggingEvents"/>
+            will be passed to the <see cref="M:Append(LoggingEvent[])"/> method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.FilterEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Test if the logging event should we output by this appender
+            </summary>
+            <param name="loggingEvent">the event to test</param>
+            <returns><c>true</c> if the event should be output, <c>false</c> if the event should be ignored</returns>
+            <remarks>
+            <para>
+            This method checks the logging event against the threshold level set
+            on this appender and also against the filters specified on this
+            appender.
+            </para>
+            <para>
+            The implementation of this method is as follows:
+            </para>
+            <para>
+            <list type="bullet">
+            	<item>
+            		<description>
+            		Checks that the severity of the <paramref name="loggingEvent"/>
+            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
+            		appender.</description>
+            	</item>
+            	<item>
+            		<description>
+            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
+            		<paramref name="loggingEvent"/>.
+            		</description>
+            	</item>
+            </list>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.AddFilter(log4net.Filter.IFilter)">
+            <summary>
+            Adds a filter to the end of the filter chain.
+            </summary>
+            <param name="filter">the filter to add to this appender</param>
+            <remarks>
+            <para>
+            The Filters are organized in a linked list.
+            </para>
+            <para>
+            Setting this property causes the new filter to be pushed onto the 
+            back of the filter chain.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.ClearFilters">
+            <summary>
+            Clears the filter list for this appender.
+            </summary>
+            <remarks>
+            <para>
+            Clears the filter list for this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.IsAsSevereAsThreshold(log4net.Core.Level)">
+            <summary>
+            Checks if the message level is below this appender's threshold.
+            </summary>
+            <param name="level"><see cref="T:log4net.Core.Level"/> to test against.</param>
+            <remarks>
+            <para>
+            If there is no threshold set, then the return value is always <c>true</c>.
+            </para>
+            </remarks>
+            <returns>
+            <c>true</c> if the <paramref name="level"/> meets the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> 
+            requirements of this appender.
+            </returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.OnClose">
+            <summary>
+            Is called when the appender is closed. Derived classes should override 
+            this method if resources need to be released.
+            </summary>
+            <remarks>
+            <para>
+            Releases any resources allocated within the appender such as file handles, 
+            network connections, etc.
+            </para>
+            <para>
+            It is a programming error to append to a closed appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Subclasses of <see cref="T:log4net.Appender.AppenderSkeleton"/> should implement this method 
+            to perform actual logging.
+            </summary>
+            <param name="loggingEvent">The event to append.</param>
+            <remarks>
+            <para>
+            A subclass must implement this method to perform
+            logging of the <paramref name="loggingEvent"/>.
+            </para>
+            <para>This method will be called by <see cref="M:DoAppend(LoggingEvent)"/>
+            if all the conditions listed for that method are met.
+            </para>
+            <para>
+            To restrict the logging of events in the appender
+            override the <see cref="M:PreAppendCheck()"/> method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent[])">
+            <summary>
+            Append a bulk array of logging events.
+            </summary>
+            <param name="loggingEvents">the array of logging events</param>
+            <remarks>
+            <para>
+            This base class implementation calls the <see cref="M:Append(LoggingEvent)"/>
+            method for each element in the bulk array.
+            </para>
+            <para>
+            A sub class that can better process a bulk array of events should
+            override this method in addition to <see cref="M:Append(LoggingEvent)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.PreAppendCheck">
+            <summary>
+            Called before <see cref="M:Append(LoggingEvent)"/> as a precondition.
+            </summary>
+            <remarks>
+            <para>
+            This method is called by <see cref="M:DoAppend(LoggingEvent)"/>
+            before the call to the abstract <see cref="M:Append(LoggingEvent)"/> method.
+            </para>
+            <para>
+            This method can be overridden in a subclass to extend the checks 
+            made before the event is passed to the <see cref="M:Append(LoggingEvent)"/> method.
+            </para>
+            <para>
+            A subclass should ensure that they delegate this call to
+            this base class if it is overridden.
+            </para>
+            </remarks>
+            <returns><c>true</c> if the call to <see cref="M:Append(LoggingEvent)"/> should proceed.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Renders the <see cref="T:log4net.Core.LoggingEvent"/> to a string.
+            </summary>
+            <param name="loggingEvent">The event to render.</param>
+            <returns>The event rendered as a string.</returns>
+            <remarks>
+            <para>
+            Helper method to render a <see cref="T:log4net.Core.LoggingEvent"/> to 
+            a string. This appender must have a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/>
+            set to render the <paramref name="loggingEvent"/> to 
+            a string.
+            </para>
+            <para>If there is exception data in the logging event and 
+            the layout does not process the exception, this method 
+            will append the exception text to the rendered string.
+            </para>
+            <para>
+            Where possible use the alternative version of this method
+            <see cref="M:RenderLoggingEvent(TextWriter,LoggingEvent)"/>.
+            That method streams the rendering onto an existing Writer
+            which can give better performance if the caller already has
+            a <see cref="T:System.IO.TextWriter"/> open and ready for writing.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Renders the <see cref="T:log4net.Core.LoggingEvent"/> to a string.
+            </summary>
+            <param name="loggingEvent">The event to render.</param>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <remarks>
+            <para>
+            Helper method to render a <see cref="T:log4net.Core.LoggingEvent"/> to 
+            a string. This appender must have a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/>
+            set to render the <paramref name="loggingEvent"/> to 
+            a string.
+            </para>
+            <para>If there is exception data in the logging event and 
+            the layout does not process the exception, this method 
+            will append the exception text to the rendered string.
+            </para>
+            <para>
+            Use this method in preference to <see cref="M:RenderLoggingEvent(LoggingEvent)"/>
+            where possible. If, however, the caller needs to render the event
+            to a string then <see cref="M:RenderLoggingEvent(LoggingEvent)"/> does
+            provide an efficient mechanism for doing so.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AppenderSkeleton.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <remarks>
+            This implementation doesn't flush anything and always returns true
+            </remarks>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_layout">
+            <summary>
+            The layout of this appender.
+            </summary>
+            <remarks>
+            See <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> for more information.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_name">
+            <summary>
+            The name of this appender.
+            </summary>
+            <remarks>
+            See <see cref="P:log4net.Appender.AppenderSkeleton.Name"/> for more information.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_threshold">
+            <summary>
+            The level threshold of this appender.
+            </summary>
+            <remarks>
+            <para>
+            There is no level threshold filtering by default.
+            </para>
+            <para>
+            See <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_errorHandler">
+            <summary>
+            It is assumed and enforced that errorHandler is never null.
+            </summary>
+            <remarks>
+            <para>
+            It is assumed and enforced that errorHandler is never null.
+            </para>
+            <para>
+            See <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_headFilter">
+            <summary>
+            The first filter in the filter chain.
+            </summary>
+            <remarks>
+            <para>
+            Set to <c>null</c> initially.
+            </para>
+            <para>
+            See <see cref="T:log4net.Filter.IFilter"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_tailFilter">
+            <summary>
+            The last filter in the filter chain.
+            </summary>
+            <remarks>
+            See <see cref="T:log4net.Filter.IFilter"/> for more information.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_closed">
+            <summary>
+            Flag indicating if this appender is closed.
+            </summary>
+            <remarks>
+            See <see cref="M:log4net.Appender.AppenderSkeleton.Close"/> for more information.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_recursiveGuard">
+            <summary>
+            The guard prevents an appender from repeatedly calling its own DoAppend method
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.m_renderWriter">
+            <summary>
+            StringWriter used to render events
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AppenderSkeleton.declaringType">
+            <summary>
+            The fully qualified type of the AppenderSkeleton class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.Threshold">
+            <summary>
+            Gets or sets the threshold <see cref="T:log4net.Core.Level"/> of this appender.
+            </summary>
+            <value>
+            The threshold <see cref="T:log4net.Core.Level"/> of the appender. 
+            </value>
+            <remarks>
+            <para>
+            All log events with lower level than the threshold level are ignored 
+            by the appender.
+            </para>
+            <para>
+            In configuration files this option is specified by setting the
+            value of the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> option to a level
+            string, such as "DEBUG", "INFO" and so on.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.ErrorHandler">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Core.IErrorHandler"/> for this appender.
+            </summary>
+            <value>The <see cref="T:log4net.Core.IErrorHandler"/> of the appender</value>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Appender.AppenderSkeleton"/> provides a default 
+            implementation for the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/> property. 
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.FilterHead">
+            <summary>
+            The filter chain.
+            </summary>
+            <value>The head of the filter chain filter chain.</value>
+            <remarks>
+            <para>
+            Returns the head Filter. The Filters are organized in a linked list
+            and so all Filters on this Appender are available through the result.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.Layout">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Layout.ILayout"/> for this appender.
+            </summary>
+            <value>The layout of the appender.</value>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Appender.AppenderSkeleton.RequiresLayout"/> for more information.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.Appender.AppenderSkeleton.RequiresLayout"/>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.Name">
+            <summary>
+            Gets or sets the name of this appender.
+            </summary>
+            <value>The name of the appender.</value>
+            <remarks>
+            <para>
+            The name uniquely identifies the appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AppenderSkeleton.RequiresLayout">
+            <summary>
+            Tests if this appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
+            </summary>
+            <remarks>
+            <para>
+            In the rather exceptional case, where the appender 
+            implementation admits a layout but can also work without it, 
+            then the appender should return <c>true</c>.
+            </para>
+            <para>
+            This default implementation always returns <c>false</c>.
+            </para>
+            </remarks>
+            <returns>
+            <c>true</c> if the appender requires a layout object, otherwise <c>false</c>.
+            </returns>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.DEFAULT_BUFFER_SIZE">
+            <summary>
+            The default buffer size.
+            </summary>
+            <remarks>
+            The default size of the cyclic buffer used to store events.
+            This is set to 512 by default.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Protected default constructor to allow subclassing.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> class.
+            </summary>
+            <param name="eventMustBeFixed">the events passed through this appender must be
+            fixed by the time that they arrive in the derived class' <c>SendBuffer</c> method.</param>
+            <remarks>
+            <para>
+            Protected constructor to allow subclassing.
+            </para>
+            <para>
+            The <paramref name="eventMustBeFixed"/> should be set if the subclass
+            expects the events delivered to be fixed even if the 
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is set to zero, i.e. when no buffering occurs.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Flush">
+            <summary>
+            Flush the currently buffered events
+            </summary>
+            <remarks>
+            <para>
+            Flushes any events that have been buffered.
+            </para>
+            <para>
+            If the appender is buffering in <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode then the contents
+            of the buffer will NOT be flushed to the appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Flush(System.Boolean)">
+            <summary>
+            Flush the currently buffered events
+            </summary>
+            <param name="flushLossyBuffer">set to <c>true</c> to flush the buffer of lossy events</param>
+            <remarks>
+            <para>
+            Flushes events that have been buffered. If <paramref name="flushLossyBuffer"/> is
+            <c>false</c> then events will only be flushed if this buffer is non-lossy mode.
+            </para>
+            <para>
+            If the appender is buffering in <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode then the contents
+            of the buffer will only be flushed if <paramref name="flushLossyBuffer"/> is <c>true</c>.
+            In this case the contents of the buffer will be tested against the 
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.LossyEvaluator"/> and if triggering will be output. All other buffered
+            events will be discarded.
+            </para>
+            <para>
+            If <paramref name="flushLossyBuffer"/> is <c>true</c> then the buffer will always
+            be emptied by calling this method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.OnClose">
+            <summary>
+            Close this appender instance.
+            </summary>
+            <remarks>
+            <para>
+            Close this appender instance. If this appender is marked
+            as not <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> then the remaining events in 
+            the buffer must be sent when the appender is closed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method. 
+            </summary>
+            <param name="loggingEvent">the event to log</param>
+            <remarks>
+            <para>
+            Stores the <paramref name="loggingEvent"/> in the cyclic buffer.
+            </para>
+            <para>
+            The buffer will be sent (i.e. passed to the <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/> 
+            method) if one of the following conditions is met:
+            </para>
+            <list type="bullet">
+            	<item>
+            		<description>The cyclic buffer is full and this appender is
+            		marked as not lossy (see <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/>)</description>
+            	</item>
+            	<item>
+            		<description>An <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> is set and
+            		it is triggered for the <paramref name="loggingEvent"/>
+            		specified.</description>
+            	</item>
+            </list>
+            <para>
+            Before the event is stored in the buffer it is fixed
+            (see <see cref="M:LoggingEvent.FixVolatileData(FixFlags)"/>) to ensure that
+            any data referenced by the event will be valid when the buffer
+            is processed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.SendFromBuffer(log4net.Core.LoggingEvent,log4net.Util.CyclicBuffer)">
+            <summary>
+            Sends the contents of the buffer.
+            </summary>
+            <param name="firstLoggingEvent">The first logging event.</param>
+            <param name="buffer">The buffer containing the events that need to be send.</param>
+            <remarks>
+            <para>
+            The subclass must override <see cref="M:SendBuffer(LoggingEvent[])"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Sends the events.
+            </summary>
+            <param name="events">The events that need to be send.</param>
+            <remarks>
+            <para>
+            The subclass must override this method to process the buffered events.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_bufferSize">
+            <summary>
+            The size of the cyclic buffer used to hold the logging events.
+            </summary>
+            <remarks>
+            Set to <see cref="F:log4net.Appender.BufferingAppenderSkeleton.DEFAULT_BUFFER_SIZE"/> by default.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_cb">
+            <summary>
+            The cyclic buffer used to store the logging events.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_evaluator">
+            <summary>
+            The triggering event evaluator that causes the buffer to be sent immediately.
+            </summary>
+            <remarks>
+            The object that is used to determine if an event causes the entire
+            buffer to be sent immediately. This field can be <c>null</c>, which 
+            indicates that event triggering is not to be done. The evaluator
+            can be set using the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> property. If this appender
+            has the <see cref="F:log4net.Appender.BufferingAppenderSkeleton.m_lossy"/> (<see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> property) set to 
+            <c>true</c> then an <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be set.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_lossy">
+            <summary>
+            Indicates if the appender should overwrite events in the cyclic buffer 
+            when it becomes full, or if the buffer should be flushed when the 
+            buffer is full.
+            </summary>
+            <remarks>
+            If this field is set to <c>true</c> then an <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must 
+            be set.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_lossyEvaluator">
+            <summary>
+            The triggering event evaluator filters discarded events.
+            </summary>
+            <remarks>
+            The object that is used to determine if an event that is discarded should
+            really be discarded or if it should be sent to the appenders. 
+            This field can be <c>null</c>, which indicates that all discarded events will
+            be discarded. 
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_fixFlags">
+            <summary>
+            Value indicating which fields in the event should be fixed
+            </summary>
+            <remarks>
+            By default all fields are fixed
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_eventMustBeFixed">
+            <summary>
+            The events delivered to the subclass must be fixed.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Lossy">
+            <summary>
+            Gets or sets a value that indicates whether the appender is lossy.
+            </summary>
+            <value>
+            <c>true</c> if the appender is lossy, otherwise <c>false</c>. The default is <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            This appender uses a buffer to store logging events before 
+            delivering them. A triggering event causes the whole buffer
+            to be send to the remote sink. If the buffer overruns before
+            a triggering event then logging events could be lost. Set
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> to <c>false</c> to prevent logging events 
+            from being lost.
+            </para>
+            <para>If <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> is set to <c>true</c> then an
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be specified.</para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize">
+            <summary>
+            Gets or sets the size of the cyclic buffer used to hold the 
+            logging events.
+            </summary>
+            <value>
+            The size of the cyclic buffer used to hold the logging events.
+            </value>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option takes a positive integer
+            representing the maximum number of logging events to collect in 
+            a cyclic buffer. When the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is reached,
+            oldest events are deleted as new events are added to the
+            buffer. By default the size of the cyclic buffer is 512 events.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is set to a value less than
+            or equal to 1 then no buffering will occur. The logging event
+            will be delivered synchronously (depending on the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/>
+            and <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> properties). Otherwise the event will
+            be buffered.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> that causes the 
+            buffer to be sent immediately.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> that causes the buffer to be
+            sent immediately.
+            </value>
+            <remarks>
+            <para>
+            The evaluator will be called for each event that is appended to this 
+            appender. If the evaluator triggers then the current buffer will 
+            immediately be sent (see <see cref="M:SendBuffer(LoggingEvent[])"/>).
+            </para>
+            <para>If <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> is set to <c>true</c> then an
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be specified.</para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.LossyEvaluator">
+            <summary>
+            Gets or sets the value of the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> to use.
+            </summary>
+            <value>
+            The value of the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> to use.
+            </value>
+            <remarks>
+            <para>
+            The evaluator will be called for each event that is discarded from this 
+            appender. If the evaluator triggers then the current buffer will immediately 
+            be sent (see <see cref="M:SendBuffer(LoggingEvent[])"/>).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.OnlyFixPartialEventData">
+            <summary>
+            Gets or sets a value indicating if only part of the logging event data
+            should be fixed.
+            </summary>
+            <value>
+            <c>true</c> if the appender should only fix part of the logging event 
+            data, otherwise <c>false</c>. The default is <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            Setting this property to <c>true</c> will cause only part of the
+            event data to be fixed and serialized. This will improve performance.
+            </para>
+            <para>
+            See <see cref="M:LoggingEvent.FixVolatileData(FixFlags)"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Fix">
+            <summary>
+            Gets or sets a the fields that will be fixed in the event
+            </summary>
+            <value>
+            The event fields that will be fixed before the event is buffered
+            </value>
+            <remarks>
+            <para>
+            The logging event needs to have certain thread specific values 
+            captured before it can be buffered. See <see cref="P:log4net.Core.LoggingEvent.Fix"/>
+            for details.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.Core.LoggingEvent.Fix"/>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.#ctor">
+            <summary> 
+            Initializes a new instance of the <see cref="T:log4net.Appender.AdoNetAppender"/> class.
+            </summary>
+            <remarks>
+            Public default constructor to initialize a new instance of this class.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.OnClose">
+            <summary>
+            Override the parent method to close the database
+            </summary>
+            <remarks>
+            <para>
+            Closes the database command and database connection.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Inserts the events into the database.
+            </summary>
+            <param name="events">The events to insert into the database.</param>
+            <remarks>
+            <para>
+            Insert all the events specified in the <paramref name="events"/>
+            array into the database.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.AddParameter(log4net.Appender.AdoNetAppenderParameter)">
+            <summary>
+            Adds a parameter to the command.
+            </summary>
+            <param name="parameter">The parameter to add to the command.</param>
+            <remarks>
+            <para>
+            Adds a parameter to the ordered list of command parameters.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.SendBuffer(System.Data.IDbTransaction,log4net.Core.LoggingEvent[])">
+            <summary>
+            Writes the events to the database using the transaction specified.
+            </summary>
+            <param name="dbTran">The transaction that the events will be executed under.</param>
+            <param name="events">The array of events to insert into the database.</param>
+            <remarks>
+            <para>
+            The transaction argument can be <c>null</c> if the appender has been
+            configured not to use transactions. See <see cref="P:log4net.Appender.AdoNetAppender.UseTransactions"/>
+            property for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.GetLogStatement(log4net.Core.LoggingEvent)">
+            <summary>
+            Formats the log message into database statement text.
+            </summary>
+            <param name="logEvent">The event being logged.</param>
+            <remarks>
+            This method can be overridden by subclasses to provide 
+            more control over the format of the database statement.
+            </remarks>
+            <returns>
+            Text that can be passed to a <see cref="T:System.Data.IDbCommand"/>.
+            </returns>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.CreateConnection(System.Type,System.String)">
+            <summary>
+            Creates an <see cref="T:System.Data.IDbConnection"/> instance used to connect to the database.
+            </summary>
+            <remarks>
+            This method is called whenever a new IDbConnection is needed (i.e. when a reconnect is necessary).
+            </remarks>
+            <param name="connectionType">The <see cref="T:System.Type"/> of the <see cref="T:System.Data.IDbConnection"/> object.</param>
+            <param name="connectionString">The connectionString output from the ResolveConnectionString method.</param>
+            <returns>An <see cref="T:System.Data.IDbConnection"/> instance with a valid connection string.</returns>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.ResolveConnectionString(System.String@)">
+            <summary>
+            Resolves the connection string from the ConnectionString, ConnectionStringName, or AppSettingsKey
+            property.
+            </summary>
+            <remarks>
+            ConnectiongStringName is only supported on .NET 2.0 and higher.
+            </remarks>
+            <param name="connectionStringContext">Additional information describing the connection string.</param>
+            <returns>A connection string used to connect to the database.</returns>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.ResolveConnectionType">
+            <summary>
+            Retrieves the class type of the ADO.NET provider.
+            </summary>
+            <remarks>
+            <para>
+            Gets the Type of the ADO.NET provider to use to connect to the
+            database. This method resolves the type specified in the 
+            <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/> property.
+            </para>
+            <para>
+            Subclasses can override this method to return a different type
+            if necessary.
+            </para>
+            </remarks>
+            <returns>The <see cref="T:System.Type"/> of the ADO.NET provider</returns>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.InitializeDatabaseConnection">
+            <summary>
+            Connects to the database.
+            </summary>		
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppender.DiposeConnection">
+            <summary>
+            Cleanup the existing connection.
+            </summary>
+            <remarks>
+            Calls the IDbConnection's <see cref="M:System.Data.IDbConnection.Close"/> method.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_parameters">
+            <summary>
+            The list of <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> objects.
+            </summary>
+            <remarks>
+            <para>
+            The list of <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_securityContext">
+            <summary>
+            The security context to use for privileged calls
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_dbConnection">
+            <summary>
+            The <see cref="T:System.Data.IDbConnection"/> that will be used
+            to insert logging events into a database.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_connectionString">
+            <summary>
+            Database connection string.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_appSettingsKey">
+            <summary>
+            The appSettings key from App.Config that contains the connection string.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_connectionStringName">
+            <summary>
+            The connectionStrings key from App.Config that contains the connection string.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_connectionType">
+            <summary>
+            String type name of the <see cref="T:System.Data.IDbConnection"/> type name.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_commandText">
+            <summary>
+            The text of the command.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_commandType">
+            <summary>
+            The command type.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_useTransactions">
+            <summary>
+            Indicates whether to use transactions when writing to the database.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.m_reconnectOnError">
+            <summary>
+            Indicates whether to reconnect when a connection is lost.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppender.declaringType">
+            <summary>
+            The fully qualified type of the AdoNetAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.ConnectionString">
+            <summary>
+            Gets or sets the database connection string that is used to connect to 
+            the database.
+            </summary>
+            <value>
+            The database connection string used to connect to the database.
+            </value>
+            <remarks>
+            <para>
+            The connections string is specific to the connection type.
+            See <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/> for more information.
+            </para>
+            </remarks>
+            <example>Connection string for MS Access via ODBC:
+            <code>"DSN=MS Access Database;UID=admin;PWD=;SystemDB=C:\data\System.mdw;SafeTransactions = 0;FIL=MS Access;DriverID = 25;DBQ=C:\data\train33.mdb"</code>
+            </example>
+            <example>Another connection string for MS Access via ODBC:
+            <code>"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Work\cvs_root\log4net-1.2\access.mdb;UID=;PWD=;"</code>
+            </example>
+            <example>Connection string for MS Access via OLE DB:
+            <code>"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Work\cvs_root\log4net-1.2\access.mdb;User Id=;Password=;"</code>
+            </example>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.AppSettingsKey">
+            <summary>
+            The appSettings key from App.Config that contains the connection string.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.ConnectionStringName">
+            <summary>
+            The connectionStrings key from App.Config that contains the connection string.
+            </summary>
+            <remarks>
+            This property requires at least .NET 2.0.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.ConnectionType">
+            <summary>
+            Gets or sets the type name of the <see cref="T:System.Data.IDbConnection"/> connection
+            that should be created.
+            </summary>
+            <value>
+            The type name of the <see cref="T:System.Data.IDbConnection"/> connection.
+            </value>
+            <remarks>
+            <para>
+            The type name of the ADO.NET provider to use.
+            </para>
+            <para>
+            The default is to use the OLE DB provider.
+            </para>
+            </remarks>
+            <example>Use the OLE DB Provider. This is the default value.
+            <code>System.Data.OleDb.OleDbConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
+            </example>
+            <example>Use the MS SQL Server Provider. 
+            <code>System.Data.SqlClient.SqlConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
+            </example>
+            <example>Use the ODBC Provider. 
+            <code>Microsoft.Data.Odbc.OdbcConnection,Microsoft.Data.Odbc,version=1.0.3300.0,publicKeyToken=b77a5c561934e089,culture=neutral</code>
+            This is an optional package that you can download from 
+            <a href="http://msdn.microsoft.com/downloads">http://msdn.microsoft.com/downloads</a> 
+            search for <b>ODBC .NET Data Provider</b>.
+            </example>
+            <example>Use the Oracle Provider. 
+            <code>System.Data.OracleClient.OracleConnection, System.Data.OracleClient, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
+            This is an optional package that you can download from 
+            <a href="http://msdn.microsoft.com/downloads">http://msdn.microsoft.com/downloads</a> 
+            search for <b>.NET Managed Provider for Oracle</b>.
+            </example>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.CommandText">
+            <summary>
+            Gets or sets the command text that is used to insert logging events
+            into the database.
+            </summary>
+            <value>
+            The command text used to insert logging events into the database.
+            </value>
+            <remarks>
+            <para>
+            Either the text of the prepared statement or the
+            name of the stored procedure to execute to write into
+            the database.
+            </para>
+            <para>
+            The <see cref="P:log4net.Appender.AdoNetAppender.CommandType"/> property determines if
+            this text is a prepared statement or a stored procedure.
+            </para>
+            <para>
+            If this property is not set, the command text is retrieved by invoking
+            <see cref="M:log4net.Appender.AdoNetAppender.GetLogStatement(log4net.Core.LoggingEvent)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.CommandType">
+            <summary>
+            Gets or sets the command type to execute.
+            </summary>
+            <value>
+            The command type to execute.
+            </value>
+            <remarks>
+            <para>
+            This value may be either <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>) to specify
+            that the <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> is a prepared statement to execute, 
+            or <see cref="F:System.Data.CommandType.StoredProcedure"/> (<c>System.Data.CommandType.StoredProcedure</c>) to specify that the
+            <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> property is the name of a stored procedure
+            to execute.
+            </para>
+            <para>
+            The default value is <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.UseTransactions">
+            <summary>
+            Should transactions be used to insert logging events in the database.
+            </summary>
+            <value>
+            <c>true</c> if transactions should be used to insert logging events in
+            the database, otherwise <c>false</c>. The default value is <c>true</c>.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets a value that indicates whether transactions should be used
+            to insert logging events in the database.
+            </para>
+            <para>
+            When set a single transaction will be used to insert the buffered events
+            into the database. Otherwise each event will be inserted without using
+            an explicit transaction.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.SecurityContext">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> used to call the NetSend method.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> used to call the NetSend method.
+            </value>
+            <remarks>
+            <para>
+            Unless a <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> specified here for this appender
+            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
+            security context to use. The default behavior is to use the security context
+            of the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.ReconnectOnError">
+            <summary>
+            Should this appender try to reconnect to the database on error.
+            </summary>
+            <value>
+            <c>true</c> if the appender should try to reconnect to the database after an
+            error has occurred, otherwise <c>false</c>. The default value is <c>false</c>, 
+            i.e. not to try to reconnect.
+            </value>
+            <remarks>
+            <para>
+            The default behaviour is for the appender not to try to reconnect to the
+            database if an error occurs. Subsequent logging events are discarded.
+            </para>
+            <para>
+            To force the appender to attempt to reconnect to the database set this
+            property to <c>true</c>.
+            </para>
+            <note>
+            When the appender attempts to connect to the database there may be a
+            delay of up to the connection timeout specified in the connection string.
+            This delay will block the calling application's thread. 
+            Until the connection can be reestablished this potential delay may occur multiple times.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppender.Connection">
+            <summary>
+            Gets or sets the underlying <see cref="T:System.Data.IDbConnection"/>.
+            </summary>
+            <value>
+            The underlying <see cref="T:System.Data.IDbConnection"/>.
+            </value>
+            <remarks>
+            <see cref="T:log4net.Appender.AdoNetAppender"/> creates a <see cref="T:System.Data.IDbConnection"/> to insert 
+            logging events into a database.  Classes deriving from <see cref="T:log4net.Appender.AdoNetAppender"/> 
+            can use this property to get or set this <see cref="T:System.Data.IDbConnection"/>.  Use the 
+            underlying <see cref="T:System.Data.IDbConnection"/> returned from <see cref="P:log4net.Appender.AdoNetAppender.Connection"/> if 
+            you require access beyond that which <see cref="T:log4net.Appender.AdoNetAppender"/> provides.
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.AdoNetAppenderParameter">
+            <summary>
+            Parameter type used by the <see cref="T:log4net.Appender.AdoNetAppender"/>.
+            </summary>
+            <remarks>
+            <para>
+            This class provides the basic database parameter properties
+            as defined by the <see cref="T:System.Data.IDbDataParameter"/> interface.
+            </para>
+            <para>This type can be subclassed to provide database specific
+            functionality. The two methods that are called externally are
+            <see cref="M:log4net.Appender.AdoNetAppenderParameter.Prepare(System.Data.IDbCommand)"/> and <see cref="M:log4net.Appender.AdoNetAppenderParameter.FormatValue(System.Data.IDbCommand,log4net.Core.LoggingEvent)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppenderParameter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> class.
+            </summary>
+            <remarks>
+            Default constructor for the AdoNetAppenderParameter class.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppenderParameter.Prepare(System.Data.IDbCommand)">
+            <summary>
+            Prepare the specified database command object.
+            </summary>
+            <param name="command">The command to prepare.</param>
+            <remarks>
+            <para>
+            Prepares the database command object by adding
+            this parameter to its collection of parameters.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AdoNetAppenderParameter.FormatValue(System.Data.IDbCommand,log4net.Core.LoggingEvent)">
+            <summary>
+            Renders the logging event and set the parameter value in the command.
+            </summary>
+            <param name="command">The command containing the parameter.</param>
+            <param name="loggingEvent">The event to be rendered.</param>
+            <remarks>
+            <para>
+            Renders the logging event using this parameters layout
+            object. Sets the value of the parameter on the command object.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_parameterName">
+            <summary>
+            The name of this parameter.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_dbType">
+            <summary>
+            The database type for this parameter.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_inferType">
+            <summary>
+            Flag to infer type rather than use the DbType
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_precision">
+            <summary>
+            The precision for this parameter.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_scale">
+            <summary>
+            The scale for this parameter.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_size">
+            <summary>
+            The size for this parameter.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_layout">
+            <summary>
+            The <see cref="T:log4net.Layout.IRawLayout"/> to use to render the
+            logging event into an object for this parameter.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.ParameterName">
+            <summary>
+            Gets or sets the name of this parameter.
+            </summary>
+            <value>
+            The name of this parameter.
+            </value>
+            <remarks>
+            <para>
+            The name of this parameter. The parameter name
+            must match up to a named parameter to the SQL stored procedure
+            or prepared statement.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.DbType">
+            <summary>
+            Gets or sets the database type for this parameter.
+            </summary>
+            <value>
+            The database type for this parameter.
+            </value>
+            <remarks>
+            <para>
+            The database type for this parameter. This property should
+            be set to the database type from the <see cref="P:log4net.Appender.AdoNetAppenderParameter.DbType"/>
+            enumeration. See <see cref="P:System.Data.IDataParameter.DbType"/>.
+            </para>
+            <para>
+            This property is optional. If not specified the ADO.NET provider 
+            will attempt to infer the type from the value.
+            </para>
+            </remarks>
+            <seealso cref="P:System.Data.IDataParameter.DbType"/>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.Precision">
+            <summary>
+            Gets or sets the precision for this parameter.
+            </summary>
+            <value>
+            The precision for this parameter.
+            </value>
+            <remarks>
+            <para>
+            The maximum number of digits used to represent the Value.
+            </para>
+            <para>
+            This property is optional. If not specified the ADO.NET provider 
+            will attempt to infer the precision from the value.
+            </para>
+            </remarks>
+            <seealso cref="P:System.Data.IDbDataParameter.Precision"/>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.Scale">
+            <summary>
+            Gets or sets the scale for this parameter.
+            </summary>
+            <value>
+            The scale for this parameter.
+            </value>
+            <remarks>
+            <para>
+            The number of decimal places to which Value is resolved.
+            </para>
+            <para>
+            This property is optional. If not specified the ADO.NET provider 
+            will attempt to infer the scale from the value.
+            </para>
+            </remarks>
+            <seealso cref="P:System.Data.IDbDataParameter.Scale"/>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.Size">
+            <summary>
+            Gets or sets the size for this parameter.
+            </summary>
+            <value>
+            The size for this parameter.
+            </value>
+            <remarks>
+            <para>
+            The maximum size, in bytes, of the data within the column.
+            </para>
+            <para>
+            This property is optional. If not specified the ADO.NET provider 
+            will attempt to infer the size from the value.
+            </para>
+            <para>
+            For BLOB data types like VARCHAR(max) it may be impossible to infer the value automatically, use -1 as the size in this case.
+            </para>
+            </remarks>
+            <seealso cref="P:System.Data.IDbDataParameter.Size"/>
+        </member>
+        <member name="P:log4net.Appender.AdoNetAppenderParameter.Layout">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Layout.IRawLayout"/> to use to 
+            render the logging event into an object for this 
+            parameter.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Layout.IRawLayout"/> used to render the
+            logging event into an object for this parameter.
+            </value>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Layout.IRawLayout"/> that renders the value for this
+            parameter.
+            </para>
+            <para>
+            The <see cref="T:log4net.Layout.RawLayoutConverter"/> can be used to adapt
+            any <see cref="T:log4net.Layout.ILayout"/> into a <see cref="T:log4net.Layout.IRawLayout"/>
+            for use in the property.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.AnsiColorTerminalAppender">
+            <summary>
+            Appends logging events to the terminal using ANSI color escape sequences.
+            </summary>
+            <remarks>
+            <para>
+            AnsiColorTerminalAppender appends log events to the standard output stream
+            or the error output stream using a layout specified by the 
+            user. It also allows the color of a specific level of message to be set.
+            </para>
+            <note>
+            This appender expects the terminal to understand the VT100 control set 
+            in order to interpret the color codes. If the terminal or console does not
+            understand the control codes the behavior is not defined.
+            </note>
+            <para>
+            By default, all output is written to the console's standard output stream.
+            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> property can be set to direct the output to the
+            error stream.
+            </para>
+            <para>
+            NOTE: This appender writes each message to the <c>System.Console.Out</c> or 
+            <c>System.Console.Error</c> that is set at the time the event is appended.
+            Therefore it is possible to programmatically redirect the output of this appender 
+            (for example NUnit does this to capture program output). While this is the desired
+            behavior of this appender it may have security implications in your application. 
+            </para>
+            <para>
+            When configuring the ANSI colored terminal appender, a mapping should be
+            specified to map a logging level to a color. For example:
+            </para>
+            <code lang="XML" escaped="true">
+            <mapping>
+            	<level value="ERROR"/>
+            	<foreColor value="White"/>
+            	<backColor value="Red"/>
+                <attributes value="Bright,Underscore"/>
+            </mapping>
+            <mapping>
+            	<level value="DEBUG"/>
+            	<backColor value="Green"/>
+            </mapping>
+            </code>
+            <para>
+            The Level is the standard log4net logging level and ForeColor and BackColor can be any
+            of the following values:
+            <list type="bullet">
+            <item><term>Blue</term><description></description></item>
+            <item><term>Green</term><description></description></item>
+            <item><term>Red</term><description></description></item>
+            <item><term>White</term><description></description></item>
+            <item><term>Yellow</term><description></description></item>
+            <item><term>Purple</term><description></description></item>
+            <item><term>Cyan</term><description></description></item>
+            </list>
+            These color values cannot be combined together to make new colors.
+            </para>
+            <para>
+            The attributes can be any combination of the following:
+            <list type="bullet">
+            <item><term>Bright</term><description>foreground is brighter</description></item>
+            <item><term>Dim</term><description>foreground is dimmer</description></item>
+            <item><term>Underscore</term><description>message is underlined</description></item>
+            <item><term>Blink</term><description>foreground is blinking (does not work on all terminals)</description></item>
+            <item><term>Reverse</term><description>foreground and background are reversed</description></item>
+            <item><term>Hidden</term><description>output is hidden</description></item>
+            <item><term>Strikethrough</term><description>message has a line through it</description></item>
+            </list>
+            While any of these attributes may be combined together not all combinations
+            work well together, for example setting both <i>Bright</i> and <i>Dim</i> attributes makes
+            no sense.
+            </para>
+            </remarks>
+            <author>Patrick Wagstrom</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.ConsoleOut">
+            <summary>
+            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.ConsoleError">
+            <summary>
+            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.PostEventCodes">
+            <summary>
+            Ansi code to reset terminal
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AnsiColorTerminalAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.AnsiColorTerminalAppender"/> class.
+            </summary>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.AnsiColorTerminalAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AnsiColorTerminalAppender.AddMapping(log4net.Appender.AnsiColorTerminalAppender.LevelColors)">
+            <summary>
+            Add a mapping of level to color
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Add a <see cref="T:log4net.Appender.AnsiColorTerminalAppender.LevelColors"/> mapping to this appender.
+            Each mapping defines the foreground and background colours
+            for a level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AnsiColorTerminalAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to the console.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AnsiColorTerminalAppender.ActivateOptions">
+            <summary>
+            Initialize the options for this appender
+            </summary>
+            <remarks>
+            <para>
+            Initialize the level to color mappings set on this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.m_writeToErrorStream">
+            <summary>
+            Flag to write output to the error stream rather than the standard output stream
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to color value
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.Target">
+            <summary>
+            Target is the value of the console output stream.
+            </summary>
+            <value>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </value>
+            <remarks>
+            <para>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes">
+            <summary>
+            The enum of possible display attributes
+            </summary>
+            <remarks>
+            <para>
+            The following flags can be combined together to
+            form the ANSI color attributes.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Appender.AnsiColorTerminalAppender"/>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Bright">
+            <summary>
+            text is bright
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Dim">
+            <summary>
+            text is dim
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Underscore">
+            <summary>
+            text is underlined
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Blink">
+            <summary>
+            text is blinking
+            </summary>
+            <remarks>
+            Not all terminals support this attribute
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Reverse">
+            <summary>
+            text and background colors are reversed
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Hidden">
+            <summary>
+            text is hidden
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Strikethrough">
+            <summary>
+            text is displayed with a strikethrough
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Light">
+            <summary>
+            text color is light
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AnsiColorTerminalAppender.AnsiColor">
+            <summary>
+            The enum of possible foreground or background color values for 
+            use with the color mapping method
+            </summary>
+            <remarks>
+            <para>
+            The output can be in one for the following ANSI colors.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Appender.AnsiColorTerminalAppender"/>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Black">
+            <summary>
+            color is black
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Red">
+            <summary>
+            color is red
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Green">
+            <summary>
+            color is green
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Yellow">
+            <summary>
+            color is yellow
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Blue">
+            <summary>
+            color is blue
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Magenta">
+            <summary>
+            color is magenta
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Cyan">
+            <summary>
+            color is cyan
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.White">
+            <summary>
+            color is white
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AnsiColorTerminalAppender.LevelColors">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the color it should be displayed as.
+            </summary>
+            <remarks>
+            <para>
+            Defines the mapping between a level and the color it should be displayed in.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LevelMappingEntry">
+            <summary>
+            An entry in the <see cref="T:log4net.Util.LevelMapping"/>
+            </summary>
+            <remarks>
+            <para>
+            This is an abstract base class for types that are stored in the
+            <see cref="T:log4net.Util.LevelMapping"/> object.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.LevelMappingEntry.#ctor">
+            <summary>
+            Default protected constructor
+            </summary>
+            <remarks>
+            <para>
+            Default protected constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LevelMappingEntry.ActivateOptions">
+            <summary>
+            Initialize any options defined on this entry
+            </summary>
+            <remarks>
+            <para>
+            Should be overridden by any classes that need to initialise based on their options
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LevelMappingEntry.Level">
+            <summary>
+            The level that is the key for this mapping 
+            </summary>
+            <value>
+            The <see cref="P:log4net.Util.LevelMappingEntry.Level"/> that is the key for this mapping 
+            </value>
+            <remarks>
+            <para>
+            Get or set the <see cref="P:log4net.Util.LevelMappingEntry.Level"/> that is the key for this
+            mapping subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ActivateOptions">
+            <summary>
+            Initialize the options for the object
+            </summary>
+            <remarks>
+            <para>
+            Combine the <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor"/> together
+            and append the attributes.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor">
+            <summary>
+            The mapped foreground color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped foreground color for the specified level
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor">
+            <summary>
+            The mapped background color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped background color for the specified level
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.Attributes">
+            <summary>
+            The color attributes for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The color attributes for the specified level
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.CombinedColor">
+            <summary>
+            The combined <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor"/>, <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor"/> and
+            <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.Attributes"/> suitable for setting the ansi terminal color.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AppenderCollection">
+            <summary>
+            A strongly-typed collection of <see cref="T:log4net.Appender.IAppender"/> objects.
+            </summary>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.ReadOnly(log4net.Appender.AppenderCollection)">
+            <summary>
+            Creates a read-only wrapper for a <c>AppenderCollection</c> instance.
+            </summary>
+            <param name="list">list to create a readonly wrapper arround</param>
+            <returns>
+            An <c>AppenderCollection</c> wrapper that is read-only.
+            </returns>
+        </member>
+        <member name="F:log4net.Appender.AppenderCollection.EmptyCollection">
+            <summary>
+            An empty readonly static AppenderCollection
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor">
+            <summary>
+            Initializes a new instance of the <c>AppenderCollection</c> class
+            that is empty and has the default initial capacity.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor(System.Int32)">
+            <summary>
+            Initializes a new instance of the <c>AppenderCollection</c> class
+            that has the specified initial capacity.
+            </summary>
+            <param name="capacity">
+            The number of elements that the new <c>AppenderCollection</c> is initially capable of storing.
+            </param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.AppenderCollection)">
+            <summary>
+            Initializes a new instance of the <c>AppenderCollection</c> class
+            that contains elements copied from the specified <c>AppenderCollection</c>.
+            </summary>
+            <param name="c">The <c>AppenderCollection</c> whose elements are copied to the new collection.</param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.IAppender[])">
+            <summary>
+            Initializes a new instance of the <c>AppenderCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Appender.IAppender"/> array.
+            </summary>
+            <param name="a">The <see cref="T:log4net.Appender.IAppender"/> array whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor(System.Collections.ICollection)">
+            <summary>
+            Initializes a new instance of the <c>AppenderCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Appender.IAppender"/> collection.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Appender.IAppender"/> collection whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.AppenderCollection.Tag)">
+            <summary>
+            Allow subclasses to avoid our default constructors
+            </summary>
+            <param name="tag"></param>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.CopyTo(log4net.Appender.IAppender[])">
+            <summary>
+            Copies the entire <c>AppenderCollection</c> to a one-dimensional
+            <see cref="T:log4net.Appender.IAppender"/> array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Appender.IAppender"/> array to copy to.</param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.CopyTo(log4net.Appender.IAppender[],System.Int32)">
+            <summary>
+            Copies the entire <c>AppenderCollection</c> to a one-dimensional
+            <see cref="T:log4net.Appender.IAppender"/> array, starting at the specified index of the target array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Appender.IAppender"/> array to copy to.</param>
+            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Add(log4net.Appender.IAppender)">
+            <summary>
+            Adds a <see cref="T:log4net.Appender.IAppender"/> to the end of the <c>AppenderCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to be added to the end of the <c>AppenderCollection</c>.</param>
+            <returns>The index at which the value has been added.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Clear">
+            <summary>
+            Removes all elements from the <c>AppenderCollection</c>.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Clone">
+            <summary>
+            Creates a shallow copy of the <see cref="T:log4net.Appender.AppenderCollection"/>.
+            </summary>
+            <returns>A new <see cref="T:log4net.Appender.AppenderCollection"/> with a shallow copy of the collection data.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Contains(log4net.Appender.IAppender)">
+            <summary>
+            Determines whether a given <see cref="T:log4net.Appender.IAppender"/> is in the <c>AppenderCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to check for.</param>
+            <returns><c>true</c> if <paramref name="item"/> is found in the <c>AppenderCollection</c>; otherwise, <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.IndexOf(log4net.Appender.IAppender)">
+            <summary>
+            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Appender.IAppender"/>
+            in the <c>AppenderCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to locate in the <c>AppenderCollection</c>.</param>
+            <returns>
+            The zero-based index of the first occurrence of <paramref name="item"/> 
+            in the entire <c>AppenderCollection</c>, if found; otherwise, -1.
+            </returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Insert(System.Int32,log4net.Appender.IAppender)">
+            <summary>
+            Inserts an element into the <c>AppenderCollection</c> at the specified index.
+            </summary>
+            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
+            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to insert.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Remove(log4net.Appender.IAppender)">
+            <summary>
+            Removes the first occurrence of a specific <see cref="T:log4net.Appender.IAppender"/> from the <c>AppenderCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to remove from the <c>AppenderCollection</c>.</param>
+            <exception cref="T:System.ArgumentException">
+            The specified <see cref="T:log4net.Appender.IAppender"/> was not found in the <c>AppenderCollection</c>.
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.RemoveAt(System.Int32)">
+            <summary>
+            Removes the element at the specified index of the <c>AppenderCollection</c>.
+            </summary>
+            <param name="index">The zero-based index of the element to remove.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through the <c>AppenderCollection</c>.
+            </summary>
+            <returns>An <see cref="T:log4net.Appender.AppenderCollection.Enumerator"/> for the entire <c>AppenderCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.AddRange(log4net.Appender.AppenderCollection)">
+            <summary>
+            Adds the elements of another <c>AppenderCollection</c> to the current <c>AppenderCollection</c>.
+            </summary>
+            <param name="x">The <c>AppenderCollection</c> whose elements should be added to the end of the current <c>AppenderCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.AddRange(log4net.Appender.IAppender[])">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Appender.IAppender"/> array to the current <c>AppenderCollection</c>.
+            </summary>
+            <param name="x">The <see cref="T:log4net.Appender.IAppender"/> array whose elements should be added to the end of the <c>AppenderCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.AddRange(System.Collections.ICollection)">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Appender.IAppender"/> collection to the current <c>AppenderCollection</c>.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Appender.IAppender"/> collection whose elements should be added to the end of the <c>AppenderCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.TrimToSize">
+            <summary>
+            Sets the capacity to the actual number of elements.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.ToArray">
+            <summary>
+            Return the collection elements as an array
+            </summary>
+            <returns>the array</returns>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.ValidateIndex(System.Int32)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.ValidateIndex(System.Int32,System.Boolean)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.Count">
+            <summary>
+            Gets the number of elements actually contained in the <c>AppenderCollection</c>.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the collection is synchronized (thread-safe).
+            </summary>
+            <returns>false, because the backing type is an array, which is never thread-safe.</returns>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.Item(System.Int32)">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Appender.IAppender"/> at the specified index.
+            </summary>
+            <param name="index">The zero-based index of the element to get or set.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            	<para><paramref name="index"/> is less than zero</para>
+            	<para>-or-</para>
+            	<para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.IsFixedSize">
+            <summary>
+            Gets a value indicating whether the collection has a fixed size.
+            </summary>
+            <value>true if the collection has a fixed size; otherwise, false. The default is false</value>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the IList is read-only.
+            </summary>
+            <value>true if the collection is read-only; otherwise, false. The default is false</value>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.Capacity">
+            <summary>
+            Gets or sets the number of elements the <c>AppenderCollection</c> can contain.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator">
+            <summary>
+            Supports type-safe iteration over a <see cref="T:log4net.Appender.AppenderCollection"/>.
+            </summary>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AppenderCollection.Tag">
+            <summary>
+            Type visible only to our subclasses
+            Used to access protected constructor
+            </summary>
+            <exclude/>
+        </member>
+        <member name="F:log4net.Appender.AppenderCollection.Tag.Default">
+            <summary>
+            A value
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AppenderCollection.Enumerator">
+            <summary>
+            Supports simple iteration over a <see cref="T:log4net.Appender.AppenderCollection"/>.
+            </summary>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Enumerator.#ctor(log4net.Appender.AppenderCollection)">
+            <summary>
+            Initializes a new instance of the <c>Enumerator</c> class.
+            </summary>
+            <param name="tc"></param>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Enumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Appender.AppenderCollection.Enumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AppenderCollection.Enumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.AppenderCollection.ReadOnlyAppenderCollection">
+            <exclude/>
+        </member>
+        <member name="T:log4net.Appender.AspNetTraceAppender">
+            <summary>
+            <para>
+            Appends log events to the ASP.NET <see cref="T:System.Web.TraceContext"/> system.
+            </para>
+            </summary>
+            <remarks>
+            <para>
+            Diagnostic information and tracing messages that you specify are appended to the output 
+            of the page that is sent to the requesting browser. Optionally, you can view this information
+            from a separate trace viewer (Trace.axd) that displays trace information for every page in a 
+            given application.
+            </para>
+            <para>
+            Trace statements are processed and displayed only when tracing is enabled. You can control 
+            whether tracing is displayed to a page, to the trace viewer, or both.
+            </para>
+            <para>
+            The logging event is passed to the <see cref="M:TraceContext.Write(string)"/> or 
+            <see cref="M:TraceContext.Warn(string)"/> method depending on the level of the logging event.
+            The event's logger name is the default value for the category parameter of the Write/Warn method. 
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Appender.AspNetTraceAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.AspNetTraceAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.AspNetTraceAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Write the logging event to the ASP.NET trace
+            </summary>
+            <param name="loggingEvent">the event to log</param>
+            <remarks>
+            <para>
+            Write the logging event to the ASP.NET trace
+            <c>HttpContext.Current.Trace</c> 
+            (<see cref="T:System.Web.TraceContext"/>).
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.AspNetTraceAppender.m_category">
+            <summary>
+            Defaults to %logger
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.AspNetTraceAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.AspNetTraceAppender.Category">
+            <summary>
+            The category parameter sent to the Trace method.
+            </summary>
+            <remarks>
+            <para>
+            Defaults to %logger which will use the logger name of the current 
+            <see cref="T:log4net.Core.LoggingEvent"/> as the category parameter.
+            </para>
+            <para>
+            </para> 
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.BufferingForwardingAppender">
+            <summary>
+            Buffers events and then forwards them to attached appenders.
+            </summary>
+            <remarks>
+            <para>
+            The events are buffered in this appender until conditions are
+            met to allow the appender to deliver the events to the attached 
+            appenders. See <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> for the
+            conditions that cause the buffer to be sent.
+            </para>
+            <para>The forwarding appender can be used to specify different 
+            thresholds and filters for the same appender at different locations 
+            within the hierarchy.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Core.IAppenderAttachable">
+            <summary>
+            Interface for attaching appenders to objects.
+            </summary>
+            <remarks>
+            <para>
+            Interface for attaching, removing and retrieving appenders.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.IAppenderAttachable.AddAppender(log4net.Appender.IAppender)">
+            <summary>
+            Attaches an appender.
+            </summary>
+            <param name="appender">The appender to add.</param>
+            <remarks>
+            <para>
+            Add the specified appender. The implementation may
+            choose to allow or deny duplicate appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IAppenderAttachable.GetAppender(System.String)">
+            <summary>
+            Gets an attached appender with the specified name.
+            </summary>
+            <param name="name">The name of the appender to get.</param>
+            <returns>
+            The appender with the name specified, or <c>null</c> if no appender with the
+            specified name is found.
+            </returns>
+            <remarks>
+            <para>
+            Returns an attached appender with the <paramref name="name"/> specified.
+            If no appender with the specified name is found <c>null</c> will be
+            returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IAppenderAttachable.RemoveAllAppenders">
+            <summary>
+            Removes all attached appenders.
+            </summary>
+            <remarks>
+            <para>
+            Removes and closes all attached appenders
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IAppenderAttachable.RemoveAppender(log4net.Appender.IAppender)">
+            <summary>
+            Removes the specified appender from the list of attached appenders.
+            </summary>
+            <param name="appender">The appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IAppenderAttachable.RemoveAppender(System.String)">
+            <summary>
+            Removes the appender with the specified name from the list of appenders.
+            </summary>
+            <param name="name">The name of the appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.IAppenderAttachable.Appenders">
+            <summary>
+            Gets all attached appenders.
+            </summary>
+            <value>
+            A collection of attached appenders.
+            </value>
+            <remarks>
+            <para>
+            Gets a collection of attached appenders.
+            If there are no attached appenders the
+            implementation should return an empty 
+            collection rather than <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingForwardingAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.OnClose">
+            <summary>
+            Closes the appender and releases resources.
+            </summary>
+            <remarks>
+            <para>
+            Releases any resources allocated within the appender such as file handles, 
+            network connections, etc.
+            </para>
+            <para>
+            It is a programming error to append to a closed appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Send the events.
+            </summary>
+            <param name="events">The events that need to be send.</param>
+            <remarks>
+            <para>
+            Forwards the events to the attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.AddAppender(log4net.Appender.IAppender)">
+            <summary>
+            Adds an <see cref="T:log4net.Appender.IAppender"/> to the list of appenders of this
+            instance.
+            </summary>
+            <param name="newAppender">The <see cref="T:log4net.Appender.IAppender"/> to add to this appender.</param>
+            <remarks>
+            <para>
+            If the specified <see cref="T:log4net.Appender.IAppender"/> is already in the list of
+            appenders, then it won't be added again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.GetAppender(System.String)">
+            <summary>
+            Looks for the appender with the specified name.
+            </summary>
+            <param name="name">The name of the appender to lookup.</param>
+            <returns>
+            The appender with the specified name, or <c>null</c>.
+            </returns>
+            <remarks>
+            <para>
+            Get the named appender attached to this buffering appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAllAppenders">
+            <summary>
+            Removes all previously added appenders from this appender.
+            </summary>
+            <remarks>
+            <para>
+            This is useful when re-reading configuration information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAppender(log4net.Appender.IAppender)">
+            <summary>
+            Removes the specified appender from the list of appenders.
+            </summary>
+            <param name="appender">The appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAppender(System.String)">
+            <summary>
+            Removes the appender with the specified name from the list of appenders.
+            </summary>
+            <param name="name">The name of the appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.BufferingForwardingAppender.m_appenderAttachedImpl">
+            <summary>
+            Implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.BufferingForwardingAppender.Appenders">
+            <summary>
+            Gets the appenders contained in this appender as an 
+            <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <remarks>
+            If no appenders can be found, then an <see cref="T:log4net.Util.EmptyCollection"/> 
+            is returned.
+            </remarks>
+            <returns>
+            A collection of the appenders in this appender.
+            </returns>
+        </member>
+        <member name="T:log4net.Appender.ColoredConsoleAppender">
+            <summary>
+            Appends logging events to the console.
+            </summary>
+            <remarks>
+            <para>
+            ColoredConsoleAppender appends log events to the standard output stream
+            or the error output stream using a layout specified by the 
+            user. It also allows the color of a specific type of message to be set.
+            </para>
+            <para>
+            By default, all output is written to the console's standard output stream.
+            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> property can be set to direct the output to the
+            error stream.
+            </para>
+            <para>
+            NOTE: This appender writes directly to the application's attached console
+            not to the <c>System.Console.Out</c> or <c>System.Console.Error</c> <c>TextWriter</c>.
+            The <c>System.Console.Out</c> and <c>System.Console.Error</c> streams can be
+            programmatically redirected (for example NUnit does this to capture program output).
+            This appender will ignore these redirections because it needs to use Win32
+            API calls to colorize the output. To respect these redirections the <see cref="T:log4net.Appender.ConsoleAppender"/>
+            must be used.
+            </para>
+            <para>
+            When configuring the colored console appender, mapping should be
+            specified to map a logging level to a color. For example:
+            </para>
+            <code lang="XML" escaped="true">
+            <mapping>
+            	<level value="ERROR"/>
+            	<foreColor value="White"/>
+            	<backColor value="Red, HighIntensity"/>
+            </mapping>
+            <mapping>
+            	<level value="DEBUG"/>
+            	<backColor value="Green"/>
+            </mapping>
+            </code>
+            <para>
+            The Level is the standard log4net logging level and ForeColor and BackColor can be any
+            combination of the following values:
+            <list type="bullet">
+            <item><term>Blue</term><description></description></item>
+            <item><term>Green</term><description></description></item>
+            <item><term>Red</term><description></description></item>
+            <item><term>White</term><description></description></item>
+            <item><term>Yellow</term><description></description></item>
+            <item><term>Purple</term><description></description></item>
+            <item><term>Cyan</term><description></description></item>
+            <item><term>HighIntensity</term><description></description></item>
+            </list>
+            </para>
+            </remarks>
+            <author>Rick Hobbs</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.ConsoleOut">
+            <summary>
+            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.ConsoleError">
+            <summary>
+            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class.
+            </summary>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class
+            with the specified layout.
+            </summary>
+            <param name="layout">the layout to use for this appender</param>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor(log4net.Layout.ILayout,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class
+            with the specified layout.
+            </summary>
+            <param name="layout">the layout to use for this appender</param>
+            <param name="writeToErrorStream">flag set to <c>true</c> to write to the console error stream</param>
+            <remarks>
+            When <paramref name="writeToErrorStream"/> is set to <c>true</c>, output is written to
+            the standard error output stream.  Otherwise, output is written to the standard
+            output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.AddMapping(log4net.Appender.ColoredConsoleAppender.LevelColors)">
+            <summary>
+            Add a mapping of level to color - done by the config file
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Add a <see cref="T:log4net.Appender.ColoredConsoleAppender.LevelColors"/> mapping to this appender.
+            Each mapping defines the foreground and background colors
+            for a level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to the console.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.ActivateOptions">
+            <summary>
+            Initialize the options for this appender
+            </summary>
+            <remarks>
+            <para>
+            Initialize the level to color mappings set on this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.m_writeToErrorStream">
+            <summary>
+            Flag to write output to the error stream rather than the standard output stream
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to color value
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.m_consoleOutputWriter">
+            <summary>
+            The console output stream writer to write to
+            </summary>
+            <remarks>
+            <para>
+            This writer is not thread safe.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ColoredConsoleAppender.Target">
+            <summary>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </summary>
+            <value>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </value>
+            <remarks>
+            <para>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ColoredConsoleAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.ColoredConsoleAppender.Colors">
+            <summary>
+            The enum of possible color values for use with the color mapping method
+            </summary>
+            <remarks>
+            <para>
+            The following flags can be combined together to
+            form the colors.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Appender.ColoredConsoleAppender"/>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Blue">
+            <summary>
+            color is blue
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Green">
+            <summary>
+            color is green
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Red">
+            <summary>
+            color is red
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.White">
+            <summary>
+            color is white
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Yellow">
+            <summary>
+            color is yellow
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Purple">
+            <summary>
+            color is purple
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Cyan">
+            <summary>
+            color is cyan
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.HighIntensity">
+            <summary>
+            color is intensified
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.ColoredConsoleAppender.LevelColors">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the color it should be displayed as.
+            </summary>
+            <remarks>
+            <para>
+            Defines the mapping between a level and the color it should be displayed in.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ColoredConsoleAppender.LevelColors.ActivateOptions">
+            <summary>
+            Initialize the options for the object
+            </summary>
+            <remarks>
+            <para>
+            Combine the <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor"/> together.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor">
+            <summary>
+            The mapped foreground color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped foreground color for the specified level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor">
+            <summary>
+            The mapped background color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped background color for the specified level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.CombinedColor">
+            <summary>
+            The combined <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor"/> suitable for 
+            setting the console color.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.ConsoleAppender">
+            <summary>
+            Appends logging events to the console.
+            </summary>
+            <remarks>
+            <para>
+            ConsoleAppender appends log events to the standard output stream
+            or the error output stream using a layout specified by the 
+            user.
+            </para>
+            <para>
+            By default, all output is written to the console's standard output stream.
+            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> property can be set to direct the output to the
+            error stream.
+            </para>
+            <para>
+            NOTE: This appender writes each message to the <c>System.Console.Out</c> or 
+            <c>System.Console.Error</c> that is set at the time the event is appended.
+            Therefore it is possible to programmatically redirect the output of this appender 
+            (for example NUnit does this to capture program output). While this is the desired
+            behavior of this appender it may have security implications in your application. 
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Appender.ConsoleAppender.ConsoleOut">
+            <summary>
+            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ConsoleAppender.ConsoleError">
+            <summary>
+            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ConsoleAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class.
+            </summary>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ConsoleAppender.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class
+            with the specified layout.
+            </summary>
+            <param name="layout">the layout to use for this appender</param>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ConsoleAppender.#ctor(log4net.Layout.ILayout,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class
+            with the specified layout.
+            </summary>
+            <param name="layout">the layout to use for this appender</param>
+            <param name="writeToErrorStream">flag set to <c>true</c> to write to the console error stream</param>
+            <remarks>
+            When <paramref name="writeToErrorStream"/> is set to <c>true</c>, output is written to
+            the standard error output stream.  Otherwise, output is written to the standard
+            output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ConsoleAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to the console.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ConsoleAppender.Target">
+            <summary>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </summary>
+            <value>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </value>
+            <remarks>
+            <para>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ConsoleAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.DebugAppender">
+            <summary>
+            Appends log events to the <see cref="T:System.Diagnostics.Debug"/> system.
+            </summary>
+            <remarks>
+            <para>
+            The application configuration file can be used to control what listeners 
+            are actually used. See the MSDN documentation for the 
+            <see cref="T:System.Diagnostics.Debug"/> class for details on configuring the
+            debug system.
+            </para>
+            <para>
+            Events are written using the <see cref="M:System.Diagnostics.Debug.Write(string,string)"/>
+            method. The event's logger name is passed as the value for the category name to the Write method.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.DebugAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.DebugAppender"/>.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.DebugAppender.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.DebugAppender"/> 
+            with a specified layout.
+            </summary>
+            <param name="layout">The layout to use with this appender.</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.DebugAppender.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.DebugAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Writes the logging event to the <see cref="T:System.Diagnostics.Debug"/> system.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the logging event to the <see cref="T:System.Diagnostics.Debug"/> system.
+            If <see cref="P:log4net.Appender.DebugAppender.ImmediateFlush"/> is <c>true</c> then the <see cref="M:System.Diagnostics.Debug.Flush"/>
+            is called.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.DebugAppender.m_immediateFlush">
+            <summary>
+            Immediate flush means that the underlying writer or output stream
+            will be flushed at the end of each append operation.
+            </summary>
+            <remarks>
+            <para>
+            Immediate flush is slower but ensures that each append request is 
+            actually written. If <see cref="P:log4net.Appender.DebugAppender.ImmediateFlush"/> is set to
+            <c>false</c>, then there is a good chance that the last few
+            logs events are not actually written to persistent media if and
+            when the application crashes.
+            </para>
+            <para>
+            The default value is <c>true</c>.</para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.DebugAppender.m_category">
+            <summary>
+            Defaults to a <see cref="T:log4net.Layout.PatternLayout"/> with %logger as the pattern.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.DebugAppender.ImmediateFlush">
+            <summary>
+            Gets or sets a value that indicates whether the appender will 
+            flush at the end of each write.
+            </summary>
+            <remarks>
+            <para>The default behavior is to flush at the end of each 
+            write. If the option is set to<c>false</c>, then the underlying 
+            stream can defer writing to physical medium to a later time. 
+            </para>
+            <para>
+            Avoiding the flush operation at the end of each append results 
+            in a performance gain of 10 to 20 percent. However, there is safety
+            trade-off involved in skipping flushing. Indeed, when flushing is
+            skipped, then it is likely that the last few log events will not
+            be recorded on disk when the application exits. This is a high
+            price to pay even for a 20% performance gain.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.DebugAppender.Category">
+            <summary>
+            Formats the category parameter sent to the Debug method.
+            </summary>
+            <remarks>
+            <para>
+            Defaults to a <see cref="T:log4net.Layout.PatternLayout"/> with %logger as the pattern which will use the logger name of the current 
+            <see cref="T:log4net.Core.LoggingEvent"/> as the category parameter.
+            </para>
+            <para>
+            </para> 
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.DebugAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.EventLogAppender">
+            <summary>
+            Writes events to the system event log.
+            </summary>
+            <remarks>
+            <para>
+            The appender will fail if you try to write using an event source that doesn't exist unless it is running with local administrator privileges.
+            See also http://logging.apache.org/log4net/release/faq.html#trouble-EventLog
+            </para>
+            <para>
+            The <c>EventID</c> of the event log entry can be
+            set using the <c>EventID</c> property (<see cref="P:log4net.Core.LoggingEvent.Properties"/>)
+            on the <see cref="T:log4net.Core.LoggingEvent"/>.
+            </para>
+            <para>
+            The <c>Category</c> of the event log entry can be
+            set using the <c>Category</c> property (<see cref="P:log4net.Core.LoggingEvent.Properties"/>)
+            on the <see cref="T:log4net.Core.LoggingEvent"/>.
+            </para>
+            <para>
+            There is a limit of 32K characters for an event log message
+            </para>
+            <para>
+            When configuring the EventLogAppender a mapping can be
+            specified to map a logging level to an event log entry type. For example:
+            </para>
+            <code lang="XML">
+            &lt;mapping&gt;
+            	&lt;level value="ERROR" /&gt;
+            	&lt;eventLogEntryType value="Error" /&gt;
+            &lt;/mapping&gt;
+            &lt;mapping&gt;
+            	&lt;level value="DEBUG" /&gt;
+            	&lt;eventLogEntryType value="Information" /&gt;
+            &lt;/mapping&gt;
+            </code>
+            <para>
+            The Level is the standard log4net logging level and eventLogEntryType can be any value
+            from the <see cref="T:System.Diagnostics.EventLogEntryType"/> enum, i.e.:
+            <list type="bullet">
+            <item><term>Error</term><description>an error event</description></item>
+            <item><term>Warning</term><description>a warning event</description></item>
+            <item><term>Information</term><description>an informational event</description></item>
+            </list>
+            </para>
+            </remarks>
+            <author>Aspi Havewala</author>
+            <author>Douglas de la Torre</author>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Thomas Voss</author>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.EventLogAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.EventLogAppender"/> class
+            with the specified <see cref="T:log4net.Layout.ILayout"/>.
+            </summary>
+            <param name="layout">The <see cref="T:log4net.Layout.ILayout"/> to use with this appender.</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.AddMapping(log4net.Appender.EventLogAppender.Level2EventLogEntryType)">
+            <summary>
+            Add a mapping of level to <see cref="T:System.Diagnostics.EventLogEntryType"/> - done by the config file
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Add a <see cref="T:log4net.Appender.EventLogAppender.Level2EventLogEntryType"/> mapping to this appender.
+            Each mapping defines the event log entry type for a level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.CreateEventSource(System.String,System.String,System.String)">
+            <summary>
+            Create an event log source
+            </summary>
+            <remarks>
+            Uses different API calls under NET_2_0
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/>
+            method. 
+            </summary>
+            <param name="loggingEvent">the event to log</param>
+            <remarks>
+            <para>Writes the event to the system event log using the 
+            <see cref="P:log4net.Appender.EventLogAppender.ApplicationName"/>.</para>
+            
+            <para>If the event has an <c>EventID</c> property (see <see cref="P:log4net.Core.LoggingEvent.Properties"/>)
+            set then this integer will be used as the event log event id.</para>
+            
+            <para>
+            There is a limit of 32K characters for an event log message
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.GetEntryType(log4net.Core.Level)">
+            <summary>
+            Get the equivalent <see cref="T:System.Diagnostics.EventLogEntryType"/> for a <see cref="T:log4net.Core.Level"/> <paramref name="level"/>
+            </summary>
+            <param name="level">the Level to convert to an EventLogEntryType</param>
+            <returns>The equivalent <see cref="T:System.Diagnostics.EventLogEntryType"/> for a <see cref="T:log4net.Core.Level"/> <paramref name="level"/></returns>
+            <remarks>
+            Because there are fewer applicable <see cref="T:System.Diagnostics.EventLogEntryType"/>
+            values to use in logging levels than there are in the 
+            <see cref="T:log4net.Core.Level"/> this is a one way mapping. There is
+            a loss of information during the conversion.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_logName">
+            <summary>
+            The log name is the section in the event logs where the messages
+            are stored.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_applicationName">
+            <summary>
+            Name of the application to use when logging.  This appears in the
+            application column of the event log named by <see cref="F:log4net.Appender.EventLogAppender.m_logName"/>.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_machineName">
+            <summary>
+            The name of the machine which holds the event log. This is
+            currently only allowed to be '.' i.e. the current machine.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to EventLogEntryType
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_securityContext">
+            <summary>
+            The security context to use for privileged calls
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_eventId">
+            <summary>
+            The event ID to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.m_category">
+            <summary>
+            The event category to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.declaringType">
+            <summary>
+            The fully qualified type of the EventLogAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT">
+            <summary>
+            The maximum size supported by default.
+            </summary>
+            <remarks>
+            http://msdn.microsoft.com/en-us/library/xzwc042w(v=vs.100).aspx
+            The 32766 documented max size is two bytes shy of 32K (I'm assuming 32766 
+            may leave space for a two byte null terminator of #0#0). The 32766 max 
+            length is what the .NET 4.0 source code checks for, but this is WRONG! 
+            Strings with a length > 31839 on Windows Vista or higher can CORRUPT 
+            the event log! See: System.Diagnostics.EventLogInternal.InternalWriteEvent() 
+            for the use of the 32766 max size.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.MAX_EVENTLOG_MESSAGE_SIZE_VISTA_OR_NEWER">
+            <summary>
+            The maximum size supported by a windows operating system that is vista
+            or newer.
+            </summary>
+            <remarks>
+            See ReportEvent API:
+            	http://msdn.microsoft.com/en-us/library/aa363679(VS.85).aspx
+            ReportEvent's lpStrings parameter:
+            "A pointer to a buffer containing an array of 
+            null-terminated strings that are merged into the message before Event Viewer 
+            displays the string to the user. This parameter must be a valid pointer 
+            (or NULL), even if wNumStrings is zero. Each string is limited to 31,839 characters."
+            
+            Going beyond the size of 31839 will (at some point) corrupt the event log on Windows
+            Vista or higher! It may succeed for a while...but you will eventually run into the
+            error: "System.ComponentModel.Win32Exception : A device attached to the system is
+            not functioning", and the event log will then be corrupt (I was able to corrupt 
+            an event log using a length of 31877 on Windows 7).
+            
+            The max size for Windows Vista or higher is documented here:
+            	http://msdn.microsoft.com/en-us/library/xzwc042w(v=vs.100).aspx.
+            Going over this size may succeed a few times but the buffer will overrun and 
+            eventually corrupt the log (based on testing).
+            
+            The maxEventMsgSize size is based on the max buffer size of the lpStrings parameter of the ReportEvent API.
+            The documented max size for EventLog.WriteEntry for Windows Vista and higher is 31839, but I'm leaving room for a
+            terminator of #0#0, as we cannot see the source of ReportEvent (though we could use an API monitor to examine the
+            buffer, given enough time).
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.EventLogAppender.MAX_EVENTLOG_MESSAGE_SIZE">
+            <summary>
+            The maximum size that the operating system supports for
+            a event log message.
+            </summary>
+            <remarks>
+            Used to determine the maximum string length that can be written
+            to the operating system event log and eventually truncate a string
+            that exceeds the limits.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.EventLogAppender.GetMaxEventLogMessageSize">
+            <summary>
+            This method determines the maximum event log message size allowed for
+            the current environment.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.LogName">
+            <summary>
+            The name of the log where messages will be stored.
+            </summary>
+            <value>
+            The string name of the log where messages will be stored.
+            </value>
+            <remarks>
+            <para>This is the name of the log as it appears in the Event Viewer
+            tree. The default value is to log into the <c>Application</c>
+            log, this is where most applications write their events. However
+            if you need a separate log for your application (or applications)
+            then you should set the <see cref="P:log4net.Appender.EventLogAppender.LogName"/> appropriately.</para>
+            <para>This should not be used to distinguish your event log messages
+            from those of other applications, the <see cref="P:log4net.Appender.EventLogAppender.ApplicationName"/>
+            property should be used to distinguish events. This property should be 
+            used to group together events into a single log.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.ApplicationName">
+            <summary>
+            Property used to set the Application name.  This appears in the
+            event logs when logging.
+            </summary>
+            <value>
+            The string used to distinguish events from different sources.
+            </value>
+            <remarks>
+            Sets the event log source property.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.MachineName">
+            <summary>
+            This property is used to return the name of the computer to use
+            when accessing the event logs.  Currently, this is the current
+            computer, denoted by a dot "."
+            </summary>
+            <value>
+            The string name of the machine holding the event log that 
+            will be logged into.
+            </value>
+            <remarks>
+            This property cannot be changed. It is currently set to '.'
+            i.e. the local machine. This may be changed in future.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.SecurityContext">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> used to write to the EventLog.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> used to write to the EventLog.
+            </value>
+            <remarks>
+            <para>
+            The system security context used to write to the EventLog.
+            </para>
+            <para>
+            Unless a <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> specified here for this appender
+            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
+            security context to use. The default behavior is to use the security context
+            of the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.EventId">
+            <summary>
+            Gets or sets the <c>EventId</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties.
+            </summary>
+            <remarks>
+            <para>
+            The <c>EventID</c> of the event log entry will normally be
+            set using the <c>EventID</c> property (<see cref="P:log4net.Core.LoggingEvent.Properties"/>)
+            on the <see cref="T:log4net.Core.LoggingEvent"/>.
+            This property provides the fallback value which defaults to 0.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.Category">
+            <summary>
+            Gets or sets the <c>Category</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties.
+            </summary>
+            <remarks>
+            <para>
+            The <c>Category</c> of the event log entry will normally be
+            set using the <c>Category</c> property (<see cref="P:log4net.Core.LoggingEvent.Properties"/>)
+            on the <see cref="T:log4net.Core.LoggingEvent"/>.
+            This property provides the fallback value which defaults to 0.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.EventLogAppender.Level2EventLogEntryType">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the color it should be displayed as.
+            </summary>
+            <remarks>
+            <para>
+            Defines the mapping between a level and its event log entry type.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType">
+            <summary>
+            The <see cref="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType"/> for this entry
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The <see cref="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType"/> for this entry
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.FileAppender">
+            <summary>
+            Appends logging events to a file.
+            </summary>
+            <remarks>
+            <para>
+            Logging events are sent to the file specified by
+            the <see cref="P:log4net.Appender.FileAppender.File"/> property.
+            </para>
+            <para>
+            The file can be opened in either append or overwrite mode 
+            by specifying the <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property.
+            If the file path is relative it is taken as relative from 
+            the application base directory. The file encoding can be
+            specified by setting the <see cref="P:log4net.Appender.FileAppender.Encoding"/> property.
+            </para>
+            <para>
+            The layout's <see cref="P:log4net.Layout.ILayout.Header"/> and <see cref="P:log4net.Layout.ILayout.Footer"/>
+            values will be written each time the file is opened and closed
+            respectively. If the <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property is <see langword="true"/>
+            then the file may contain multiple copies of the header and footer.
+            </para>
+            <para>
+            This appender will first try to open the file for writing when <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/>
+            is called. This will typically be during configuration.
+            If the file cannot be opened for writing the appender will attempt
+            to open the file again each time a message is logged to the appender.
+            If the file cannot be opened for writing when a message is logged then
+            the message will be discarded by this appender.
+            </para>
+            <para>
+            The <see cref="T:log4net.Appender.FileAppender"/> supports pluggable file locking models via
+            the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> property.
+            The default behavior, implemented by <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/> 
+            is to obtain an exclusive write lock on the file until this appender is closed.
+            The alternative models only hold a
+            write lock while the appender is writing a logging event (<see cref="T:log4net.Appender.FileAppender.MinimalLock"/>)
+            or synchronize by using a named system wide Mutex (<see cref="T:log4net.Appender.FileAppender.InterProcessLock"/>).
+            </para>
+            <para>
+            All locking strategies have issues and you should seriously consider using a different strategy that
+            avoids having multiple processes logging to the same file.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Rodrigo B. de Oliveira</author>
+            <author>Douglas de la Torre</author>
+            <author>Niall Daley</author>
+        </member>
+        <member name="T:log4net.Appender.TextWriterAppender">
+            <summary>
+            Sends logging events to a <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <remarks>
+            <para>
+            An Appender that writes to a <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            <para>
+            This appender may be used stand alone if initialized with an appropriate
+            writer, however it is typically used as a base class for an appender that
+            can open a <see cref="T:System.IO.TextWriter"/> to write to.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Douglas de la Torre</author>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.#ctor(log4net.Layout.ILayout,System.IO.Stream)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class and
+            sets the output destination to a new <see cref="T:System.IO.StreamWriter"/> initialized 
+            with the specified <see cref="T:System.IO.Stream"/>.
+            </summary>
+            <param name="layout">The layout to use with this appender.</param>
+            <param name="os">The <see cref="T:System.IO.Stream"/> to output to.</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.#ctor(log4net.Layout.ILayout,System.IO.TextWriter)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class and sets
+            the output destination to the specified <see cref="T:System.IO.StreamWriter"/>.
+            </summary>
+            <param name="layout">The layout to use with this appender</param>
+            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to output to</param>
+            <remarks>
+            The <see cref="T:System.IO.TextWriter"/> must have been previously opened.
+            </remarks>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.PreAppendCheck">
+            <summary>
+            This method determines if there is a sense in attempting to append.
+            </summary>
+            <remarks>
+            <para>
+            This method checks if an output target has been set and if a
+            layout has been set. 
+            </para>
+            </remarks>
+            <returns><c>false</c> if any of the preconditions fail.</returns>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/>
+            method. 
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes a log statement to the output stream if the output stream exists 
+            and is writable.  
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.Append(log4net.Core.LoggingEvent[])">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent[])"/>
+            method. 
+            </summary>
+            <param name="loggingEvents">The array of events to log.</param>
+            <remarks>
+            <para>
+            This method writes all the bulk logged events to the output writer
+            before flushing the stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.OnClose">
+            <summary>
+            Close this appender instance. The underlying stream or writer is also closed.
+            </summary>
+            <remarks>
+            Closed appenders cannot be reused.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.WriteFooterAndCloseWriter">
+            <summary>
+            Writes the footer and closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <remarks>
+            <para>
+            Writes the footer and closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.CloseWriter">
+            <summary>
+            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <remarks>
+            <para>
+            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.Reset">
+            <summary>
+            Clears internal references to the underlying <see cref="T:System.IO.TextWriter"/> 
+            and other variables.
+            </summary>
+            <remarks>
+            <para>
+            Subclasses can override this method for an alternate closing behavior.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.WriteFooter">
+            <summary>
+            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
+            </summary>
+            <remarks>
+            <para>
+            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.WriteHeader">
+            <summary>
+            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
+            </summary>
+            <remarks>
+            <para>
+            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.PrepareWriter">
+            <summary>
+            Called to allow a subclass to lazily initialize the writer
+            </summary>
+            <remarks>
+            <para>
+            This method is called when an event is logged and the <see cref="P:log4net.Appender.TextWriterAppender.Writer"/> or
+            <see cref="P:log4net.Appender.TextWriterAppender.QuietWriter"/> have not been set. This allows a subclass to
+            attempt to initialize the writer multiple times.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.TextWriterAppender.m_qtw">
+            <summary>
+            This is the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
+            will be written to. 
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.TextWriterAppender.m_immediateFlush">
+            <summary>
+            Immediate flush means that the underlying <see cref="T:System.IO.TextWriter"/> 
+            or output stream will be flushed at the end of each append operation.
+            </summary>
+            <remarks>
+            <para>
+            Immediate flush is slower but ensures that each append request is 
+            actually written. If <see cref="P:log4net.Appender.TextWriterAppender.ImmediateFlush"/> is set to
+            <c>false</c>, then there is a good chance that the last few
+            logging events are not actually persisted if and when the application 
+            crashes.
+            </para>
+            <para>
+            The default value is <c>true</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.TextWriterAppender.declaringType">
+            <summary>
+            The fully qualified type of the TextWriterAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TextWriterAppender.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="P:log4net.Appender.TextWriterAppender.ImmediateFlush">
+            <summary>
+            Gets or set whether the appender will flush at the end 
+            of each append operation.
+            </summary>
+            <value>
+            <para>
+            The default behavior is to flush at the end of each 
+            append operation.
+            </para>
+            <para>
+            If this option is set to <c>false</c>, then the underlying 
+            stream can defer persisting the logging event to a later 
+            time.
+            </para>
+            </value>
+            <remarks>
+            Avoiding the flush operation at the end of each append results in
+            a performance gain of 10 to 20 percent. However, there is safety
+            trade-off involved in skipping flushing. Indeed, when flushing is
+            skipped, then it is likely that the last few log events will not
+            be recorded on disk when the application exits. This is a high
+            price to pay even for a 20% performance gain.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TextWriterAppender.Writer">
+            <summary>
+            Sets the <see cref="T:System.IO.TextWriter"/> where the log output will go.
+            </summary>
+            <remarks>
+            <para>
+            The specified <see cref="T:System.IO.TextWriter"/> must be open and writable.
+            </para>
+            <para>
+            The <see cref="T:System.IO.TextWriter"/> will be closed when the appender 
+            instance is closed.
+            </para>
+            <para>
+            <b>Note:</b> Logging to an unopened <see cref="T:System.IO.TextWriter"/> will fail.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TextWriterAppender.ErrorHandler">
+            <summary>
+            Gets or set the <see cref="T:log4net.Core.IErrorHandler"/> and the underlying 
+            <see cref="T:log4net.Util.QuietTextWriter"/>, if any, for this appender. 
+            </summary>
+            <value>
+            The <see cref="T:log4net.Core.IErrorHandler"/> for this appender.
+            </value>
+        </member>
+        <member name="P:log4net.Appender.TextWriterAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TextWriterAppender.QuietWriter">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
+            will be written to. 
+            </summary>
+            <value>
+            The <see cref="T:log4net.Util.QuietTextWriter"/> where logging events are written.
+            </value>
+            <remarks>
+            <para>
+            This is the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
+            will be written to. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.#ctor(log4net.Layout.ILayout,System.String,System.Boolean)">
+            <summary>
+            Construct a new appender using the layout, file and append mode.
+            </summary>
+            <param name="layout">the layout to use with this appender</param>
+            <param name="filename">the full path to the file to write to</param>
+            <param name="append">flag to indicate if the file should be appended to</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.#ctor(log4net.Layout.ILayout,System.String)">
+            <summary>
+            Construct a new appender using the layout and file specified.
+            The file will be appended to.
+            </summary>
+            <param name="layout">the layout to use with this appender</param>
+            <param name="filename">the full path to the file to write to</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ActivateOptions">
+            <summary>
+            Activate the options on the file appender. 
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            This will cause the file to be opened.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.Reset">
+            <summary>
+            Closes any previously opened file and calls the parent's <see cref="M:log4net.Appender.TextWriterAppender.Reset"/>.
+            </summary>
+            <remarks>
+            <para>
+            Resets the filename and the file stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.OnClose">
+            <summary>
+            Close this appender instance. The underlying stream or writer is also closed.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.PrepareWriter">
+            <summary>
+            Called to initialize the file writer
+            </summary>
+            <remarks>
+            <para>
+            Will be called for each logged message until the file is
+            successfully opened.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/>
+            method. 
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes a log statement to the output stream if the output stream exists 
+            and is writable.  
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.Append(log4net.Core.LoggingEvent[])">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent[])"/>
+            method. 
+            </summary>
+            <param name="loggingEvents">The array of events to log.</param>
+            <remarks>
+            <para>
+            Acquires the output file locks once before writing all the events to
+            the stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.WriteFooter">
+            <summary>
+            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
+            </summary>
+            <remarks>
+            <para>
+            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.WriteHeader">
+            <summary>
+            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
+            </summary>
+            <remarks>
+            <para>
+            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.CloseWriter">
+            <summary>
+            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <remarks>
+            <para>
+            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.CloseFile">
+            <summary>
+            Closes the previously opened file.
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Layout.ILayout.Footer"/> to the file and then
+            closes the file.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.SafeOpenFile(System.String,System.Boolean)">
+            <summary>
+            Sets and <i>opens</i> the file where the log output will go. The specified file must be writable.
+            </summary>
+            <param name="fileName">The path to the log file. Must be a fully qualified path.</param>
+            <param name="append">If true will append to fileName. Otherwise will truncate fileName</param>
+            <remarks>
+            <para>
+            Calls <see cref="M:log4net.Appender.FileAppender.OpenFile(System.String,System.Boolean)"/> but guarantees not to throw an exception.
+            Errors are passed to the <see cref="P:log4net.Appender.TextWriterAppender.ErrorHandler"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.OpenFile(System.String,System.Boolean)">
+            <summary>
+            Sets and <i>opens</i> the file where the log output will go. The specified file must be writable.
+            </summary>
+            <param name="fileName">The path to the log file. Must be a fully qualified path.</param>
+            <param name="append">If true will append to fileName. Otherwise will truncate fileName</param>
+            <remarks>
+            <para>
+            If there was already an opened file, then the previous file
+            is closed first.
+            </para>
+            <para>
+            This method will ensure that the directory structure
+            for the <paramref name="fileName"/> specified exists.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.Stream)">
+            <summary>
+            Sets the quiet writer used for file output
+            </summary>
+            <param name="fileStream">the file stream that has been opened for writing</param>
+            <remarks>
+            <para>
+            This implementation of <see cref="M:SetQWForFiles(Stream)"/> creates a <see cref="T:System.IO.StreamWriter"/>
+            over the <paramref name="fileStream"/> and passes it to the 
+            <see cref="M:SetQWForFiles(TextWriter)"/> method.
+            </para>
+            <para>
+            This method can be overridden by sub classes that want to wrap the
+            <see cref="T:System.IO.Stream"/> in some way, for example to encrypt the output
+            data using a <c>System.Security.Cryptography.CryptoStream</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.TextWriter)">
+            <summary>
+            Sets the quiet writer being used.
+            </summary>
+            <param name="writer">the writer over the file stream that has been opened for writing</param>
+            <remarks>
+            <para>
+            This method can be overridden by sub classes that want to
+            wrap the <see cref="T:System.IO.TextWriter"/> in some way.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ConvertToFullPath(System.String)">
+            <summary>
+            Convert a path into a fully qualified path.
+            </summary>
+            <param name="path">The path to convert.</param>
+            <returns>The fully qualified path.</returns>
+            <remarks>
+            <para>
+            Converts the path specified to a fully
+            qualified path. If the path is relative it is
+            taken as relative from the application base 
+            directory.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_appendToFile">
+            <summary>
+            Flag to indicate if we should append to the file
+            or overwrite the file. The default is to append.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_fileName">
+            <summary>
+            The name of the log file.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_encoding">
+            <summary>
+            The encoding to use for the file stream.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_securityContext">
+            <summary>
+            The security context to use for privileged calls
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_stream">
+            <summary>
+            The stream to log to. Has added locking semantics
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.m_lockingModel">
+            <summary>
+            The locking model to use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.FileAppender.declaringType">
+            <summary>
+            The fully qualified type of the FileAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.File">
+            <summary>
+            Gets or sets the path to the file that logging will be written to.
+            </summary>
+            <value>
+            The path to the file that logging will be written to.
+            </value>
+            <remarks>
+            <para>
+            If the path is relative it is taken as relative from 
+            the application base directory.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.AppendToFile">
+            <summary>
+            Gets or sets a flag that indicates whether the file should be
+            appended to or overwritten.
+            </summary>
+            <value>
+            Indicates whether the file should be appended to or overwritten.
+            </value>
+            <remarks>
+            <para>
+            If the value is set to false then the file will be overwritten, if 
+            it is set to true then the file will be appended to.
+            </para>
+            The default value is true.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.Encoding">
+            <summary>
+            Gets or sets <see cref="P:log4net.Appender.FileAppender.Encoding"/> used to write to the file.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.FileAppender.Encoding"/> used to write to the file.
+            </value>
+            <remarks>
+            <para>
+            The default encoding set is <see cref="P:System.Text.Encoding.Default"/>
+            which is the encoding for the system's current ANSI code page.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.SecurityContext">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> used to write to the file.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> used to write to the file.
+            </value>
+            <remarks>
+            <para>
+            Unless a <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> specified here for this appender
+            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
+            security context to use. The default behavior is to use the security context
+            of the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.LockingModel">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to handle locking of the file.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to lock the file.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to handle locking of the file.
+            </para>
+            <para>
+            There are three built in locking models, <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/>, <see cref="T:log4net.Appender.FileAppender.MinimalLock"/> and <see cref="T:log4net.Appender.FileAppender.InterProcessLock"/> .
+            The first locks the file from the start of logging to the end, the 
+            second locks only for the minimal amount of time when logging each message
+            and the last synchronizes processes using a named system wide Mutex.
+            </para>
+            <para>
+            The default locking model is the <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.FileAppender.LockingStream">
+            <summary>
+            Write only <see cref="T:System.IO.Stream"/> that uses the <see cref="T:log4net.Appender.FileAppender.LockingModelBase"/> 
+            to manage access to an underlying resource.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingStream.BeginWrite(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)">
+            <summary>
+            True asynchronous writes are not supported, the implementation forces a synchronous write.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LogException">
+            <summary>
+            Exception base type for log4net.
+            </summary>
+            <remarks>
+            <para>
+            This type extends <see cref="T:System.ApplicationException"/>. It
+            does not add any new functionality but does differentiate the
+            type of exception being thrown.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.LogException.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogException.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">A message to include with the exception.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class with
+            the specified message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogException.#ctor(System.String,System.Exception)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">A message to include with the exception.</param>
+            <param name="innerException">A nested exception to include.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class
+            with the specified message and inner exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization constructor
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class 
+            with serialized data.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.FileAppender.LockingModelBase">
+            <summary>
+            Locking model base class
+            </summary>
+            <remarks>
+            <para>
+            Base class for the locking models available to the <see cref="T:log4net.Appender.FileAppender"/> derived loggers.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
+            <summary>
+            Open the output file
+            </summary>
+            <param name="filename">The filename to use</param>
+            <param name="append">Whether to append to the file, or overwrite</param>
+            <param name="encoding">The encoding to use</param>
+            <remarks>
+            <para>
+            Open the file specified and prepare for logging. 
+            No writes will be made until <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/> is called.
+            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/>,
+            <see cref="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.LockingModelBase.CloseFile"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.CloseFile">
+            <summary>
+            Close the file
+            </summary>
+            <remarks>
+            <para>
+            Close the file. No further writes will be made.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.ActivateOptions">
+            <summary>
+            Initializes all resources used by this locking model.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.OnClose">
+            <summary>
+            Disposes all resources that were initialized by this locking model.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock">
+            <summary>
+            Acquire the lock on the file
+            </summary>
+            <returns>A stream that is ready to be written to.</returns>
+            <remarks>
+            <para>
+            Acquire the lock on the file in preparation for writing to it. 
+            Return a stream pointing to the file. <see cref="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock"/>
+            must be called to release the lock on the output file.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock">
+            <summary>
+            Release the lock on the file
+            </summary>
+            <remarks>
+            <para>
+            Release the lock on the file. No further writes will be made to the 
+            stream until <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/> is called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.CreateStream(System.String,System.Boolean,System.IO.FileShare)">
+            <summary>
+            Helper method that creates a FileStream under CurrentAppender's SecurityContext.
+            </summary>
+            <remarks>
+            <para>
+            Typically called during OpenFile or AcquireLock. 
+            </para>
+            <para>
+            If the directory portion of the <paramref name="filename"/> does not exist, it is created
+            via Directory.CreateDirecctory.
+            </para>
+            </remarks>
+            <param name="filename"></param>
+            <param name="append"></param>
+            <param name="fileShare"></param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.LockingModelBase.CloseStream(System.IO.Stream)">
+            <summary>
+            Helper method to close <paramref name="stream"/> under CurrentAppender's SecurityContext.
+            </summary>
+            <remarks>
+            Does not set <paramref name="stream"/> to null.
+            </remarks>
+            <param name="stream"></param>
+        </member>
+        <member name="P:log4net.Appender.FileAppender.LockingModelBase.CurrentAppender">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Appender.FileAppender"/> for this LockingModel
+            </summary>
+            <value>
+            The <see cref="T:log4net.Appender.FileAppender"/> for this LockingModel
+            </value>
+            <remarks>
+            <para>
+            The file appender this locking model is attached to and working on
+            behalf of.
+            </para>
+            <para>
+            The file appender is used to locate the security context and the error handler to use.
+            </para>
+            <para>
+            The value of this property will be set before <see cref="M:log4net.Appender.FileAppender.LockingModelBase.OpenFile(System.String,System.Boolean,System.Text.Encoding)"/> is
+            called.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.FileAppender.ExclusiveLock">
+            <summary>
+            Hold an exclusive lock on the output file
+            </summary>
+            <remarks>
+            <para>
+            Open the file once for writing and hold it open until <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile"/> is called. 
+            Maintains an exclusive lock on the file during this time.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
+            <summary>
+            Open the file specified and prepare for logging.
+            </summary>
+            <param name="filename">The filename to use</param>
+            <param name="append">Whether to append to the file, or overwrite</param>
+            <param name="encoding">The encoding to use</param>
+            <remarks>
+            <para>
+            Open the file specified and prepare for logging. 
+            No writes will be made until <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock"/> is called.
+            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock"/>,
+            <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile">
+            <summary>
+            Close the file
+            </summary>
+            <remarks>
+            <para>
+            Close the file. No further writes will be made.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock">
+            <summary>
+            Acquire the lock on the file
+            </summary>
+            <returns>A stream that is ready to be written to.</returns>
+            <remarks>
+            <para>
+            Does nothing. The lock is already taken
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.ReleaseLock">
+            <summary>
+            Release the lock on the file
+            </summary>
+            <remarks>
+            <para>
+            Does nothing. The lock will be released when the file is closed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.ActivateOptions">
+            <summary>
+            Initializes all resources used by this locking model.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.OnClose">
+            <summary>
+            Disposes all resources that were initialized by this locking model.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.FileAppender.MinimalLock">
+            <summary>
+            Acquires the file lock for each write
+            </summary>
+            <remarks>
+            <para>
+            Opens the file once for each <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/>/<see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/> cycle, 
+            thus holding the lock for the minimal amount of time. This method of locking
+            is considerably slower than <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/> but allows 
+            other processes to move/delete the log file whilst logging continues.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
+            <summary>
+            Prepares to open the file when the first message is logged.
+            </summary>
+            <param name="filename">The filename to use</param>
+            <param name="append">Whether to append to the file, or overwrite</param>
+            <param name="encoding">The encoding to use</param>
+            <remarks>
+            <para>
+            Open the file specified and prepare for logging. 
+            No writes will be made until <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/> is called.
+            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/>,
+            <see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.MinimalLock.CloseFile"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.CloseFile">
+            <summary>
+            Close the file
+            </summary>
+            <remarks>
+            <para>
+            Close the file. No further writes will be made.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock">
+            <summary>
+            Acquire the lock on the file
+            </summary>
+            <returns>A stream that is ready to be written to.</returns>
+            <remarks>
+            <para>
+            Acquire the lock on the file in preparation for writing to it. 
+            Return a stream pointing to the file. <see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/>
+            must be called to release the lock on the output file.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock">
+            <summary>
+            Release the lock on the file
+            </summary>
+            <remarks>
+            <para>
+            Release the lock on the file. No further writes will be made to the 
+            stream until <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/> is called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.ActivateOptions">
+            <summary>
+            Initializes all resources used by this locking model.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.MinimalLock.OnClose">
+            <summary>
+            Disposes all resources that were initialized by this locking model.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.FileAppender.InterProcessLock">
+            <summary>
+            Provides cross-process file locking.
+            </summary>
+            <author>Ron Grabowski</author>
+            <author>Steve Wranovsky</author>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
+            <summary>
+            Open the file specified and prepare for logging.
+            </summary>
+            <param name="filename">The filename to use</param>
+            <param name="append">Whether to append to the file, or overwrite</param>
+            <param name="encoding">The encoding to use</param>
+            <remarks>
+            <para>
+            Open the file specified and prepare for logging. 
+            No writes will be made until <see cref="M:log4net.Appender.FileAppender.InterProcessLock.AcquireLock"/> is called.
+            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.InterProcessLock.AcquireLock"/>,
+            -<see cref="M:log4net.Appender.FileAppender.InterProcessLock.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.InterProcessLock.CloseFile"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.CloseFile">
+            <summary>
+            Close the file
+            </summary>
+            <remarks>
+            <para>
+            Close the file. No further writes will be made.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.AcquireLock">
+            <summary>
+            Acquire the lock on the file
+            </summary>
+            <returns>A stream that is ready to be written to.</returns>
+            <remarks>
+            <para>
+            Does nothing. The lock is already taken
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.ReleaseLock">
+            <summary>
+            Releases the lock and allows others to acquire a lock.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.ActivateOptions">
+            <summary>
+            Initializes all resources used by this locking model.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.FileAppender.InterProcessLock.OnClose">
+            <summary>
+            Disposes all resources that were initialized by this locking model.
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.ForwardingAppender">
+            <summary>
+            This appender forwards logging events to attached appenders.
+            </summary>
+            <remarks>
+            <para>
+            The forwarding appender can be used to specify different thresholds
+            and filters for the same appender at different locations within the hierarchy.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ForwardingAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.OnClose">
+            <summary>
+            Closes the appender and releases resources.
+            </summary>
+            <remarks>
+            <para>
+            Releases any resources allocated within the appender such as file handles, 
+            network connections, etc.
+            </para>
+            <para>
+            It is a programming error to append to a closed appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Forward the logging event to the attached appenders 
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Delivers the logging event to all the attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.Append(log4net.Core.LoggingEvent[])">
+            <summary>
+            Forward the logging events to the attached appenders 
+            </summary>
+            <param name="loggingEvents">The array of events to log.</param>
+            <remarks>
+            <para>
+            Delivers the logging events to all the attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.AddAppender(log4net.Appender.IAppender)">
+            <summary>
+            Adds an <see cref="T:log4net.Appender.IAppender"/> to the list of appenders of this
+            instance.
+            </summary>
+            <param name="newAppender">The <see cref="T:log4net.Appender.IAppender"/> to add to this appender.</param>
+            <remarks>
+            <para>
+            If the specified <see cref="T:log4net.Appender.IAppender"/> is already in the list of
+            appenders, then it won't be added again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.GetAppender(System.String)">
+            <summary>
+            Looks for the appender with the specified name.
+            </summary>
+            <param name="name">The name of the appender to lookup.</param>
+            <returns>
+            The appender with the specified name, or <c>null</c>.
+            </returns>
+            <remarks>
+            <para>
+            Get the named appender attached to this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.RemoveAllAppenders">
+            <summary>
+            Removes all previously added appenders from this appender.
+            </summary>
+            <remarks>
+            <para>
+            This is useful when re-reading configuration information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.RemoveAppender(log4net.Appender.IAppender)">
+            <summary>
+            Removes the specified appender from the list of appenders.
+            </summary>
+            <param name="appender">The appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ForwardingAppender.RemoveAppender(System.String)">
+            <summary>
+            Removes the appender with the specified name from the list of appenders.
+            </summary>
+            <param name="name">The name of the appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ForwardingAppender.m_appenderAttachedImpl">
+            <summary>
+            Implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.ForwardingAppender.Appenders">
+            <summary>
+            Gets the appenders contained in this appender as an 
+            <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <remarks>
+            If no appenders can be found, then an <see cref="T:log4net.Util.EmptyCollection"/> 
+            is returned.
+            </remarks>
+            <returns>
+            A collection of the appenders in this appender.
+            </returns>
+        </member>
+        <member name="T:log4net.Appender.LocalSyslogAppender">
+            <summary>
+            Logs events to a local syslog service.
+            </summary>
+            <remarks>
+            <note>
+            This appender uses the POSIX libc library functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c>.
+            If these functions are not available on the local system then this appender will not work!
+            </note>
+            <para>
+            The functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c> are specified in SUSv2 and 
+            POSIX 1003.1-2001 standards. These are used to log messages to the local syslog service.
+            </para>
+            <para>
+            This appender talks to a local syslog service. If you need to log to a remote syslog
+            daemon and you cannot configure your local syslog service to do this you may be
+            able to use the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> to log via UDP.
+            </para>
+            <para>
+            Syslog messages must have a facility and and a severity. The severity
+            is derived from the Level of the logging event.
+            The facility must be chosen from the set of defined syslog 
+            <see cref="T:log4net.Appender.LocalSyslogAppender.SyslogFacility"/> values. The facilities list is predefined
+            and cannot be extended.
+            </para>
+            <para>
+            An identifier is specified with each log message. This can be specified
+            by setting the <see cref="P:log4net.Appender.LocalSyslogAppender.Identity"/> property. The identity (also know 
+            as the tag) must not contain white space. The default value for the
+            identity is the application name (from <see cref="P:log4net.Util.SystemInfo.ApplicationFriendlyName"/>).
+            </para>
+            </remarks>
+            <author>Rob Lyon</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.LocalSyslogAppender"/> class.
+            </summary>
+            <remarks>
+            This instance of the <see cref="T:log4net.Appender.LocalSyslogAppender"/> class is set up to write 
+            to a local syslog service.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.AddMapping(log4net.Appender.LocalSyslogAppender.LevelSeverity)">
+            <summary>
+            Add a mapping of level to severity
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Adds a <see cref="T:log4net.Appender.LocalSyslogAppender.LevelSeverity"/> to this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to a remote syslog daemon.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.OnClose">
+            <summary>
+            Close the syslog when the appender is closed
+            </summary>
+            <remarks>
+            <para>
+            Close the syslog when the appender is closed
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.GetSeverity(log4net.Core.Level)">
+            <summary>
+            Translates a log4net level to a syslog severity.
+            </summary>
+            <param name="level">A log4net level.</param>
+            <returns>A syslog severity.</returns>
+            <remarks>
+            <para>
+            Translates a log4net level to a syslog severity.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.GeneratePriority(log4net.Appender.LocalSyslogAppender.SyslogFacility,log4net.Appender.LocalSyslogAppender.SyslogSeverity)">
+            <summary>
+            Generate a syslog priority.
+            </summary>
+            <param name="facility">The syslog facility.</param>
+            <param name="severity">The syslog severity.</param>
+            <returns>A syslog priority.</returns>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.m_facility">
+            <summary>
+            The facility. The default facility is <see cref="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User"/>.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.m_identity">
+            <summary>
+            The message identity
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.m_handleToIdentity">
+            <summary>
+            Marshaled handle to the identity string. We have to hold on to the
+            string as the <c>openlog</c> and <c>syslog</c> APIs just hold the
+            pointer to the ident and dereference it for each log message.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to syslog severity
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.openlog(System.IntPtr,System.Int32,log4net.Appender.LocalSyslogAppender.SyslogFacility)">
+            <summary>
+            Open connection to system logger.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.syslog(System.Int32,System.String,System.String)">
+            <summary>
+            Generate a log message.
+            </summary>
+            <remarks>
+            <para>
+            The libc syslog method takes a format string and a variable argument list similar
+            to the classic printf function. As this type of vararg list is not supported
+            by C# we need to specify the arguments explicitly. Here we have specified the
+            format string with a single message argument. The caller must set the format 
+            string to <c>"%s"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.LocalSyslogAppender.closelog">
+            <summary>
+            Close descriptor used to write to system logger.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.LocalSyslogAppender.Identity">
+            <summary>
+            Message identity
+            </summary>
+            <remarks>
+            <para>
+            An identifier is specified with each log message. This can be specified
+            by setting the <see cref="P:log4net.Appender.LocalSyslogAppender.Identity"/> property. The identity (also know 
+            as the tag) must not contain white space. The default value for the
+            identity is the application name (from <see cref="P:log4net.Util.SystemInfo.ApplicationFriendlyName"/>).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.LocalSyslogAppender.Facility">
+            <summary>
+            Syslog facility
+            </summary>
+            <remarks>
+            Set to one of the <see cref="T:log4net.Appender.LocalSyslogAppender.SyslogFacility"/> values. The list of
+            facilities is predefined and cannot be extended. The default value
+            is <see cref="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User"/>.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.LocalSyslogAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.LocalSyslogAppender.SyslogSeverity">
+            <summary>
+            syslog severities
+            </summary>
+            <remarks>
+            <para>
+            The log4net Level maps to a syslog severity using the
+            <see cref="M:log4net.Appender.LocalSyslogAppender.AddMapping(log4net.Appender.LocalSyslogAppender.LevelSeverity)"/> method and the <see cref="T:log4net.Appender.LocalSyslogAppender.LevelSeverity"/>
+            class. The severity is set on <see cref="P:log4net.Appender.LocalSyslogAppender.LevelSeverity.Severity"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Emergency">
+            <summary>
+            system is unusable
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Alert">
+            <summary>
+            action must be taken immediately
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Critical">
+            <summary>
+            critical conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Error">
+            <summary>
+            error conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Warning">
+            <summary>
+            warning conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Notice">
+            <summary>
+            normal but significant condition
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Informational">
+            <summary>
+            informational
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Debug">
+            <summary>
+            debug-level messages
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.LocalSyslogAppender.SyslogFacility">
+            <summary>
+            syslog facilities
+            </summary>
+            <remarks>
+            <para>
+            The syslog facility defines which subsystem the logging comes from.
+            This is set on the <see cref="P:log4net.Appender.LocalSyslogAppender.Facility"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Kernel">
+            <summary>
+            kernel messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User">
+            <summary>
+            random user-level messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Mail">
+            <summary>
+            mail system
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Daemons">
+            <summary>
+            system daemons
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Authorization">
+            <summary>
+            security/authorization messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Syslog">
+            <summary>
+            messages generated internally by syslogd
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Printer">
+            <summary>
+            line printer subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.News">
+            <summary>
+            network news subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Uucp">
+            <summary>
+            UUCP subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Clock">
+            <summary>
+            clock (cron/at) daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Authorization2">
+            <summary>
+            security/authorization  messages (private)
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Ftp">
+            <summary>
+            ftp daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Ntp">
+            <summary>
+            NTP subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Audit">
+            <summary>
+            log audit
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Alert">
+            <summary>
+            log alert
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Clock2">
+            <summary>
+            clock daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local0">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local1">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local2">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local3">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local4">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local5">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local6">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local7">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.LocalSyslogAppender.LevelSeverity">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the syslog severity that is should be logged at.
+            </summary>
+            <remarks>
+            <para>
+            A class to act as a mapping between the level that a logging call is made at and
+            the syslog severity that is should be logged at.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.LocalSyslogAppender.LevelSeverity.Severity">
+            <summary>
+            The mapped syslog severity for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped syslog severity for the specified level
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.ManagedColoredConsoleAppender">
+            <summary>
+            Appends colorful logging events to the console, using the .NET 2
+            built-in capabilities.
+            </summary>
+            <remarks>
+            <para>
+            ManagedColoredConsoleAppender appends log events to the standard output stream
+            or the error output stream using a layout specified by the 
+            user. It also allows the color of a specific type of message to be set.
+            </para>
+            <para>
+            By default, all output is written to the console's standard output stream.
+            The <see cref="P:log4net.Appender.ManagedColoredConsoleAppender.Target"/> property can be set to direct the output to the
+            error stream.
+            </para>
+            <para>
+            When configuring the colored console appender, mappings should be
+            specified to map logging levels to colors. For example:
+            </para>
+            <code lang="XML" escaped="true">
+            <mapping>
+            	<level value="ERROR"/>
+            	<foreColor value="DarkRed"/>
+            	<backColor value="White"/>
+            </mapping>
+            <mapping>
+            	<level value="WARN"/>
+            	<foreColor value="Yellow"/>
+            </mapping>
+            <mapping>
+            	<level value="INFO"/>
+            	<foreColor value="White"/>
+            </mapping>
+            <mapping>
+            	<level value="DEBUG"/>
+            	<foreColor value="Blue"/>
+            </mapping>
+            </code>
+            <para>
+            The Level is the standard log4net logging level while
+            ForeColor and BackColor are the values of <see cref="T:System.ConsoleColor"/>
+            enumeration.
+            </para>
+            <para>
+            Based on the ColoredConsoleAppender
+            </para>
+            </remarks>
+            <author>Rick Hobbs</author>
+            <author>Nicko Cadell</author>
+            <author>Pavlos Touboulidis</author>
+        </member>
+        <member name="F:log4net.Appender.ManagedColoredConsoleAppender.ConsoleOut">
+            <summary>
+            The <see cref="P:log4net.Appender.ManagedColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ManagedColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ManagedColoredConsoleAppender.ConsoleError">
+            <summary>
+            The <see cref="P:log4net.Appender.ManagedColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.ManagedColoredConsoleAppender.Target"/> to use when writing to the Console 
+            standard error output stream.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ManagedColoredConsoleAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.ManagedColoredConsoleAppender"/> class.
+            </summary>
+            <remarks>
+            The instance of the <see cref="T:log4net.Appender.ManagedColoredConsoleAppender"/> class is set up to write 
+            to the standard output stream.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ManagedColoredConsoleAppender.AddMapping(log4net.Appender.ManagedColoredConsoleAppender.LevelColors)">
+            <summary>
+            Add a mapping of level to color - done by the config file
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Add a <see cref="T:log4net.Appender.ManagedColoredConsoleAppender.LevelColors"/> mapping to this appender.
+            Each mapping defines the foreground and background colors
+            for a level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ManagedColoredConsoleAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to the console.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.ManagedColoredConsoleAppender.ActivateOptions">
+            <summary>
+            Initialize the options for this appender
+            </summary>
+            <remarks>
+            <para>
+            Initialize the level to color mappings set on this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.ManagedColoredConsoleAppender.m_writeToErrorStream">
+            <summary>
+            Flag to write output to the error stream rather than the standard output stream
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.ManagedColoredConsoleAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to color value
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.ManagedColoredConsoleAppender.Target">
+            <summary>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </summary>
+            <value>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </value>
+            <remarks>
+            <para>
+            Target is the value of the console output stream.
+            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ManagedColoredConsoleAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.ManagedColoredConsoleAppender.LevelColors">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the color it should be displayed as.
+            </summary>
+            <remarks>
+            <para>
+            Defines the mapping between a level and the color it should be displayed in.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ManagedColoredConsoleAppender.LevelColors.ForeColor">
+            <summary>
+            The mapped foreground color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped foreground color for the specified level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.ManagedColoredConsoleAppender.LevelColors.BackColor">
+            <summary>
+            The mapped background color for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped background color for the specified level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.MemoryAppender">
+            <summary>
+            Stores logging events in an array.
+            </summary>
+            <remarks>
+            <para>
+            The memory appender stores all the logging events
+            that are appended in an in-memory array.
+            </para>
+            <para>
+            Use the <see cref="M:PopAllEvents()"/> method to get
+            and clear the current list of events that have been appended.
+            </para>
+            <para>
+            Use the <see cref="M:GetEvents()"/> method to get the current
+            list of events that have been appended.  Note there is a
+            race-condition when calling <see cref="M:GetEvents()"/> and
+            <see cref="M:Clear()"/> in pairs, you better use <see
+            mref="M:PopAllEvents()"/> in that case.
+            </para>
+            <para>
+            Use the <see cref="M:Clear()"/> method to clear the
+            current list of events.  Note there is a
+            race-condition when calling <see cref="M:GetEvents()"/> and
+            <see cref="M:Clear()"/> in pairs, you better use <see
+            mref="M:PopAllEvents()"/> in that case.
+            </para>
+            </remarks>
+            <author>Julian Biddle</author>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Appender.MemoryAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.MemoryAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.MemoryAppender.GetEvents">
+            <summary>
+            Gets the events that have been logged.
+            </summary>
+            <returns>The events that have been logged</returns>
+            <remarks>
+            <para>
+            Gets the events that have been logged.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.MemoryAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method. 
+            </summary>
+            <param name="loggingEvent">the event to log</param>
+            <remarks>
+            <para>Stores the <paramref name="loggingEvent"/> in the events list.</para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.MemoryAppender.Clear">
+            <summary>
+            Clear the list of events
+            </summary>
+            <remarks>
+            Clear the list of events
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.MemoryAppender.PopAllEvents">
+            <summary>
+            Gets the events that have been logged and clears the list of events.
+            </summary>
+            <returns>The events that have been logged</returns>
+            <remarks>
+            <para>
+            Gets the events that have been logged and clears the list of events.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.MemoryAppender.m_eventsList">
+            <summary>
+            The list of events that have been appended.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.MemoryAppender.m_fixFlags">
+            <summary>
+            Value indicating which fields in the event should be fixed
+            </summary>
+            <remarks>
+            By default all fields are fixed
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.MemoryAppender.OnlyFixPartialEventData">
+            <summary>
+            Gets or sets a value indicating whether only part of the logging event 
+            data should be fixed.
+            </summary>
+            <value>
+            <c>true</c> if the appender should only fix part of the logging event 
+            data, otherwise <c>false</c>. The default is <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            Setting this property to <c>true</c> will cause only part of the event 
+            data to be fixed and stored in the appender, hereby improving performance. 
+            </para>
+            <para>
+            See <see cref="M:LoggingEvent.FixVolatileData(bool)"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.MemoryAppender.Fix">
+            <summary>
+            Gets or sets the fields that will be fixed in the event
+            </summary>
+            <remarks>
+            <para>
+            The logging event needs to have certain thread specific values 
+            captured before it can be buffered. See <see cref="P:log4net.Core.LoggingEvent.Fix"/>
+            for details.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.NetSendAppender">
+            <summary>
+            Logs entries by sending network messages using the 
+            <see cref="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)"/> native function.
+            </summary>
+            <remarks>
+            <para>
+            You can send messages only to names that are active 
+            on the network. If you send the message to a user name, 
+            that user must be logged on and running the Messenger 
+            service to receive the message.
+            </para>
+            <para>
+            The receiver will get a top most window displaying the 
+            messages one at a time, therefore this appender should 
+            not be used to deliver a high volume of messages.
+            </para>
+            <para>
+            The following table lists some possible uses for this appender :
+            </para>
+            <para>
+            <list type="table">
+                <listheader>
+                    <term>Action</term>
+                    <description>Property Value(s)</description>
+                </listheader>
+                <item>
+                    <term>Send a message to a user account on the local machine</term>
+                    <description>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Server"/> = &lt;name of the local machine&gt;
+                        </para>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> = &lt;user name&gt;
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>Send a message to a user account on a remote machine</term>
+                    <description>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Server"/> = &lt;name of the remote machine&gt;
+                        </para>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> = &lt;user name&gt;
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>Send a message to a domain user account</term>
+                    <description>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Server"/> = &lt;name of a domain controller | uninitialized&gt;
+                        </para>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> = &lt;user name&gt;
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>Send a message to all the names in a workgroup or domain</term>
+                    <description>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> = &lt;workgroup name | domain name&gt;*
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>Send a message from the local machine to a remote machine</term>
+                    <description>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Server"/> = &lt;name of the local machine | uninitialized&gt;
+                        </para>
+                        <para>
+                        <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> = &lt;name of the remote machine&gt;
+                        </para>
+                    </description>
+                </item>
+            </list>
+            </para>
+            <para>
+            <b>Note :</b> security restrictions apply for sending 
+            network messages, see <see cref="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)"/> 
+            for more information.
+            </para>
+            </remarks>
+            <example>
+            <para>
+            An example configuration section to log information 
+            using this appender from the local machine, named 
+            LOCAL_PC, to machine OPERATOR_PC :
+            </para>
+            <code lang="XML" escaped="true">
+            <appender name="NetSendAppender_Operator" type="log4net.Appender.NetSendAppender">
+                <server value="LOCAL_PC"/>
+                <recipient value="OPERATOR_PC"/>
+                <layout type="log4net.Layout.PatternLayout" value="%-5p %c [%x] - %m%n"/>
+            </appender>
+            </code>
+            </example>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Appender.NetSendAppender.m_server">
+            <summary>
+            The DNS or NetBIOS name of the server on which the function is to execute.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.NetSendAppender.m_sender">
+            <summary>
+            The sender of the network message.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.NetSendAppender.m_recipient">
+            <summary>
+            The message alias to which the message should be sent.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.NetSendAppender.m_securityContext">
+            <summary>
+            The security context to use for privileged calls
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.NetSendAppender.#ctor">
+            <summary>
+            Initializes the appender.
+            </summary>
+            <remarks>
+            The default constructor initializes all fields to their default values.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.NetSendAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            The appender will be ignored if no <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> was specified.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">The required property <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> was not specified.</exception>
+        </member>
+        <member name="M:log4net.Appender.NetSendAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Sends the event using a network message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)">
+            <summary>
+            Sends a buffer of information to a registered message alias.
+            </summary>
+            <param name="serverName">The DNS or NetBIOS name of the server on which the function is to execute.</param>
+            <param name="msgName">The message alias to which the message buffer should be sent</param>
+            <param name="fromName">The originator of the message.</param>
+            <param name="buffer">The message text.</param>
+            <param name="bufferSize">The length, in bytes, of the message text.</param>
+            <remarks>
+            <para>
+            The following restrictions apply for sending network messages:
+            </para>
+            <para>
+            <list type="table">
+                <listheader>
+                    <term>Platform</term>
+                    <description>Requirements</description>
+                </listheader>
+                <item>
+                    <term>Windows NT</term>
+                    <description>
+                        <para>
+                        No special group membership is required to send a network message.
+                        </para>
+                        <para>
+                        Admin, Accounts, Print, or Server Operator group membership is required to 
+                        successfully send a network message on a remote server.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>Windows 2000 or later</term>
+                    <description>
+                        <para>
+                        If you send a message on a domain controller that is running Active Directory, 
+                        access is allowed or denied based on the access control list (ACL) for the securable 
+                        object. The default ACL permits only Domain Admins and Account Operators to send a network message. 
+                        </para>
+                        <para>
+                        On a member server or workstation, only Administrators and Server Operators can send a network message. 
+                        </para>
+                    </description>
+                </item>
+            </list>
+            </para>
+            <para>
+            For more information see <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/security_requirements_for_the_network_management_functions.asp">Security Requirements for the Network Management Functions</a>.
+            </para>
+            </remarks>
+            <returns>
+            <para>
+            If the function succeeds, the return value is zero.
+            </para>
+            </returns>
+        </member>
+        <member name="P:log4net.Appender.NetSendAppender.Sender">
+            <summary>
+            Gets or sets the sender of the message.
+            </summary>
+            <value>
+            The sender of the message.
+            </value>
+            <remarks>
+            If this property is not specified, the message is sent from the local computer.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.NetSendAppender.Recipient">
+            <summary>
+            Gets or sets the message alias to which the message should be sent.
+            </summary>
+            <value>
+            The recipient of the message.
+            </value>
+            <remarks>
+            This property should always be specified in order to send a message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.NetSendAppender.Server">
+            <summary>
+            Gets or sets the DNS or NetBIOS name of the remote server on which the function is to execute.
+            </summary>
+            <value>
+            DNS or NetBIOS name of the remote server on which the function is to execute.
+            </value>
+            <remarks>
+            <para>
+            For Windows NT 4.0 and earlier, the string should begin with \\.
+            </para>
+            <para>
+            If this property is not specified, the local computer is used. 
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.NetSendAppender.SecurityContext">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> used to call the NetSend method.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> used to call the NetSend method.
+            </value>
+            <remarks>
+            <para>
+            Unless a <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> specified here for this appender
+            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
+            security context to use. The default behavior is to use the security context
+            of the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.NetSendAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.OutputDebugStringAppender">
+            <summary>
+            Appends log events to the OutputDebugString system.
+            </summary>
+            <remarks>
+            <para>
+            OutputDebugStringAppender appends log events to the
+            OutputDebugString system.
+            </para>
+            <para>
+            The string is passed to the native <c>OutputDebugString</c> 
+            function.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Appender.OutputDebugStringAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.OutputDebugStringAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.OutputDebugStringAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Write the logging event to the output debug string API
+            </summary>
+            <param name="loggingEvent">the event to log</param>
+            <remarks>
+            <para>
+            Write the logging event to the output debug string API
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.OutputDebugStringAppender.OutputDebugString(System.String)">
+            <summary>
+            Stub for OutputDebugString native method
+            </summary>
+            <param name="message">the string to output</param>
+            <remarks>
+            <para>
+            Stub for OutputDebugString native method
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.OutputDebugStringAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RemoteSyslogAppender">
+            <summary>
+            Logs events to a remote syslog daemon.
+            </summary>
+            <remarks>
+            <para>
+            The BSD syslog protocol is used to remotely log to
+            a syslog daemon. The syslogd listens for for messages
+            on UDP port 514.
+            </para>
+            <para>
+            The syslog UDP protocol is not authenticated. Most syslog daemons
+            do not accept remote log messages because of the security implications.
+            You may be able to use the LocalSyslogAppender to talk to a local
+            syslog service.
+            </para>
+            <para>
+            There is an RFC 3164 that claims to document the BSD Syslog Protocol.
+            This RFC can be seen here: http://www.faqs.org/rfcs/rfc3164.html.
+            This appender generates what the RFC calls an "Original Device Message",
+            i.e. does not include the TIMESTAMP or HOSTNAME fields. By observation
+            this format of message will be accepted by all current syslog daemon
+            implementations. The daemon will attach the current time and the source
+            hostname or IP address to any messages received.
+            </para>
+            <para>
+            Syslog messages must have a facility and and a severity. The severity
+            is derived from the Level of the logging event.
+            The facility must be chosen from the set of defined syslog 
+            <see cref="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility"/> values. The facilities list is predefined
+            and cannot be extended.
+            </para>
+            <para>
+            An identifier is specified with each log message. This can be specified
+            by setting the <see cref="P:log4net.Appender.RemoteSyslogAppender.Identity"/> property. The identity (also know 
+            as the tag) must not contain white space. The default value for the
+            identity is the application name (from <see cref="P:log4net.Core.LoggingEvent.Domain"/>).
+            </para>
+            </remarks>
+            <author>Rob Lyon</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Appender.UdpAppender">
+             <summary>
+             Sends logging events as connectionless UDP datagrams to a remote host or a 
+             multicast group using an <see cref="T:System.Net.Sockets.UdpClient"/>.
+             </summary>
+             <remarks>
+             <para>
+             UDP guarantees neither that messages arrive, nor that they arrive in the correct order.
+             </para>
+             <para>
+             To view the logging results, a custom application can be developed that listens for logging 
+             events.
+             </para>
+             <para>
+             When decoding events send via this appender remember to use the same encoding
+             to decode the events as was used to send the events. See the <see cref="P:log4net.Appender.UdpAppender.Encoding"/>
+             property to specify the encoding to use.
+             </para>
+             </remarks>
+             <example>
+             This example shows how to log receive logging events that are sent 
+             on IP address 244.0.0.1 and port 8080 to the console. The event is 
+             encoded in the packet as a unicode string and it is decoded as such. 
+             <code lang="C#">
+             IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
+             UdpClient udpClient;
+             byte[] buffer;
+             string loggingEvent;
+             
+             try 
+             {
+                 udpClient = new UdpClient(8080);
+                 
+                 while(true) 
+                 {
+                     buffer = udpClient.Receive(ref remoteEndPoint);
+                     loggingEvent = System.Text.Encoding.Unicode.GetString(buffer);
+                     Console.WriteLine(loggingEvent);
+                 }
+             } 
+             catch(Exception e) 
+             {
+                 Console.WriteLine(e.ToString());
+             }
+             </code>
+             <code lang="Visual Basic">
+             Dim remoteEndPoint as IPEndPoint
+             Dim udpClient as UdpClient
+             Dim buffer as Byte()
+             Dim loggingEvent as String
+             
+             Try 
+                 remoteEndPoint = new IPEndPoint(IPAddress.Any, 0)
+                 udpClient = new UdpClient(8080)
+            
+                 While True
+                     buffer = udpClient.Receive(ByRef remoteEndPoint)
+                     loggingEvent = System.Text.Encoding.Unicode.GetString(buffer)
+                     Console.WriteLine(loggingEvent)
+                 Wend
+             Catch e As Exception
+                 Console.WriteLine(e.ToString())
+             End Try
+             </code>
+             <para>
+             An example configuration section to log information using this appender to the 
+             IP 224.0.0.1 on port 8080:
+             </para>
+             <code lang="XML" escaped="true">
+             <appender name="UdpAppender" type="log4net.Appender.UdpAppender">
+                 <remoteAddress value="224.0.0.1"/>
+                 <remotePort value="8080"/>
+                 <layout type="log4net.Layout.PatternLayout" value="%-5level %logger [%ndc] - %message%newline"/>
+             </appender>
+             </code>
+             </example>
+             <author>Gert Driesen</author>
+             <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.UdpAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.UdpAppender"/> class.
+            </summary>
+            <remarks>
+            The default constructor initializes all fields to their default values.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.UdpAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            The appender will be ignored if no <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> was specified or 
+            an invalid remote or local TCP port number was specified.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">The required property <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> was not specified.</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">The TCP port number assigned to <see cref="P:log4net.Appender.UdpAppender.LocalPort"/> or <see cref="P:log4net.Appender.UdpAppender.RemotePort"/> is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
+        </member>
+        <member name="M:log4net.Appender.UdpAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Sends the event using an UDP datagram.
+            </para>
+            <para>
+            Exceptions are passed to the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.UdpAppender.OnClose">
+            <summary>
+            Closes the UDP connection and releases all resources associated with 
+            this <see cref="T:log4net.Appender.UdpAppender"/> instance.
+            </summary>
+            <remarks>
+            <para>
+            Disables the underlying <see cref="T:System.Net.Sockets.UdpClient"/> and releases all managed 
+            and unmanaged resources associated with the <see cref="T:log4net.Appender.UdpAppender"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.UdpAppender.InitializeClientConnection">
+            <summary>
+            Initializes the underlying  <see cref="T:System.Net.Sockets.UdpClient"/> connection.
+            </summary>
+            <remarks>
+            <para>
+            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> is initialized and binds to the 
+            port number from which you intend to communicate.
+            </para>
+            <para>
+            Exceptions are passed to the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_remoteAddress">
+            <summary>
+            The IP address of the remote host or multicast group to which 
+            the logging event will be sent.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_remotePort">
+            <summary>
+            The TCP port number of the remote host or multicast group to 
+            which the logging event will be sent.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_remoteEndPoint">
+            <summary>
+            The cached remote endpoint to which the logging events will be sent.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_localPort">
+            <summary>
+            The TCP port number from which the <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_client">
+            <summary>
+            The <see cref="T:System.Net.Sockets.UdpClient"/> instance that will be used for sending the 
+            logging events.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.UdpAppender.m_encoding">
+            <summary>
+            The encoding to use for the packet.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.RemoteAddress">
+            <summary>
+            Gets or sets the IP address of the remote host or multicast group to which
+            the underlying <see cref="T:System.Net.Sockets.UdpClient"/> should sent the logging event.
+            </summary>
+            <value>
+            The IP address of the remote host or multicast group to which the logging event 
+            will be sent.
+            </value>
+            <remarks>
+            <para>
+            Multicast addresses are identified by IP class <b>D</b> addresses (in the range 224.0.0.0 to
+            239.255.255.255).  Multicast packets can pass across different networks through routers, so
+            it is possible to use multicasts in an Internet scenario as long as your network provider 
+            supports multicasting.
+            </para>
+            <para>
+            Hosts that want to receive particular multicast messages must register their interest by joining
+            the multicast group.  Multicast messages are not sent to networks where no host has joined
+            the multicast group.  Class <b>D</b> IP addresses are used for multicast groups, to differentiate
+            them from normal host addresses, allowing nodes to easily detect if a message is of interest.
+            </para>
+            <para>
+            Static multicast addresses that are needed globally are assigned by IANA.  A few examples are listed in the table below:
+            </para>
+            <para>
+            <list type="table">
+                <listheader>
+                    <term>IP Address</term>
+                    <description>Description</description>
+                </listheader>
+                <item>
+                    <term>224.0.0.1</term>
+                    <description>
+                        <para>
+                        Sends a message to all system on the subnet.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>224.0.0.2</term>
+                    <description>
+                        <para>
+                        Sends a message to all routers on the subnet.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>224.0.0.12</term>
+                    <description>
+                        <para>
+                        The DHCP server answers messages on the IP address 224.0.0.12, but only on a subnet.
+                        </para>
+                    </description>
+                </item>
+            </list>
+            </para>
+            <para>
+            A complete list of actually reserved multicast addresses and their owners in the ranges
+            defined by RFC 3171 can be found at the <A href="http://www.iana.org/assignments/multicast-addresses">IANA web site</A>. 
+            </para>
+            <para>
+            The address range 239.0.0.0 to 239.255.255.255 is reserved for administrative scope-relative 
+            addresses.  These addresses can be reused with other local groups.  Routers are typically 
+            configured with filters to prevent multicast traffic in this range from flowing outside
+            of the local network.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.RemotePort">
+            <summary>
+            Gets or sets the TCP port number of the remote host or multicast group to which 
+            the underlying <see cref="T:System.Net.Sockets.UdpClient"/> should sent the logging event.
+            </summary>
+            <value>
+            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
+            indicating the TCP port number of the remote host or multicast group to which the logging event 
+            will be sent.
+            </value>
+            <remarks>
+            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> will send messages to this TCP port number
+            on the remote host or multicast group.
+            </remarks>
+            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.LocalPort">
+            <summary>
+            Gets or sets the TCP port number from which the underlying <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
+            </summary>
+            <value>
+            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
+            indicating the TCP port number from which the underlying <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
+            </value>
+            <remarks>
+            <para>
+            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> will bind to this port for sending messages.
+            </para>
+            <para>
+            Setting the value to 0 (the default) will cause the udp client not to bind to
+            a local port.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.Encoding">
+            <summary>
+            Gets or sets <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
+            </value>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.Client">
+            <summary>
+            Gets or sets the underlying <see cref="T:System.Net.Sockets.UdpClient"/>.
+            </summary>
+            <value>
+            The underlying <see cref="T:System.Net.Sockets.UdpClient"/>.
+            </value>
+            <remarks>
+            <see cref="T:log4net.Appender.UdpAppender"/> creates a <see cref="T:System.Net.Sockets.UdpClient"/> to send logging events 
+            over a network.  Classes deriving from <see cref="T:log4net.Appender.UdpAppender"/> can use this
+            property to get or set this <see cref="T:System.Net.Sockets.UdpClient"/>.  Use the underlying <see cref="T:System.Net.Sockets.UdpClient"/>
+            returned from <see cref="P:log4net.Appender.UdpAppender.Client"/> if you require access beyond that which 
+            <see cref="T:log4net.Appender.UdpAppender"/> provides.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.RemoteEndPoint">
+            <summary>
+            Gets or sets the cached remote endpoint to which the logging events should be sent.
+            </summary>
+            <value>
+            The cached remote endpoint to which the logging events will be sent.
+            </value>
+            <remarks>
+            The <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> method will initialize the remote endpoint 
+            with the values of the <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> and <see cref="P:log4net.Appender.UdpAppender.RemotePort"/>
+            properties.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.UdpAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.DefaultSyslogPort">
+            <summary>
+            Syslog port 514
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.c_renderBufferSize">
+            <summary>
+            Initial buffer size
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.c_renderBufferMaxCapacity">
+            <summary>
+            Maximum buffer size before it is recycled
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> class.
+            </summary>
+            <remarks>
+            This instance of the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> class is set up to write 
+            to a remote syslog daemon.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.AddMapping(log4net.Appender.RemoteSyslogAppender.LevelSeverity)">
+            <summary>
+            Add a mapping of level to severity
+            </summary>
+            <param name="mapping">The mapping to add</param>
+            <remarks>
+            <para>
+            Add a <see cref="T:log4net.Appender.RemoteSyslogAppender.LevelSeverity"/> mapping to this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the event to a remote syslog daemon.
+            </para>
+            <para>
+            The format of the output will depend on the appender's layout.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.ActivateOptions">
+            <summary>
+            Initialize the options for this appender
+            </summary>
+            <remarks>
+            <para>
+            Initialize the level to syslog severity mappings set on this appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.GetSeverity(log4net.Core.Level)">
+            <summary>
+            Translates a log4net level to a syslog severity.
+            </summary>
+            <param name="level">A log4net level.</param>
+            <returns>A syslog severity.</returns>
+            <remarks>
+            <para>
+            Translates a log4net level to a syslog severity.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemoteSyslogAppender.GeneratePriority(log4net.Appender.RemoteSyslogAppender.SyslogFacility,log4net.Appender.RemoteSyslogAppender.SyslogSeverity)">
+            <summary>
+            Generate a syslog priority.
+            </summary>
+            <param name="facility">The syslog facility.</param>
+            <param name="severity">The syslog severity.</param>
+            <returns>A syslog priority.</returns>
+            <remarks>
+            <para>
+            Generate a syslog priority.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.m_facility">
+            <summary>
+            The facility. The default facility is <see cref="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User"/>.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.m_identity">
+            <summary>
+            The message identity
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.m_levelMapping">
+            <summary>
+            Mapping from level object to syslog severity
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.RemoteSyslogAppender.Identity">
+            <summary>
+            Message identity
+            </summary>
+            <remarks>
+            <para>
+            An identifier is specified with each log message. This can be specified
+            by setting the <see cref="P:log4net.Appender.RemoteSyslogAppender.Identity"/> property. The identity (also know 
+            as the tag) must not contain white space. The default value for the
+            identity is the application name (from <see cref="P:log4net.Core.LoggingEvent.Domain"/>).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RemoteSyslogAppender.Facility">
+            <summary>
+            Syslog facility
+            </summary>
+            <remarks>
+            Set to one of the <see cref="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility"/> values. The list of
+            facilities is predefined and cannot be extended. The default value
+            is <see cref="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User"/>.
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RemoteSyslogAppender.SyslogSeverity">
+            <summary>
+            syslog severities
+            </summary>
+            <remarks>
+            <para>
+            The syslog severities.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Emergency">
+            <summary>
+            system is unusable
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Alert">
+            <summary>
+            action must be taken immediately
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Critical">
+            <summary>
+            critical conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Error">
+            <summary>
+            error conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Warning">
+            <summary>
+            warning conditions
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Notice">
+            <summary>
+            normal but significant condition
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Informational">
+            <summary>
+            informational
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Debug">
+            <summary>
+            debug-level messages
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility">
+            <summary>
+            syslog facilities
+            </summary>
+            <remarks>
+            <para>
+            The syslog facilities
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Kernel">
+            <summary>
+            kernel messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User">
+            <summary>
+            random user-level messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Mail">
+            <summary>
+            mail system
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Daemons">
+            <summary>
+            system daemons
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Authorization">
+            <summary>
+            security/authorization messages
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Syslog">
+            <summary>
+            messages generated internally by syslogd
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Printer">
+            <summary>
+            line printer subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.News">
+            <summary>
+            network news subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Uucp">
+            <summary>
+            UUCP subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Clock">
+            <summary>
+            clock (cron/at) daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Authorization2">
+            <summary>
+            security/authorization  messages (private)
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Ftp">
+            <summary>
+            ftp daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Ntp">
+            <summary>
+            NTP subsystem
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Audit">
+            <summary>
+            log audit
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Alert">
+            <summary>
+            log alert
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Clock2">
+            <summary>
+            clock daemon
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local0">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local1">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local2">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local3">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local4">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local5">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local6">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local7">
+            <summary>
+            reserved for local use
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.RemoteSyslogAppender.LevelSeverity">
+            <summary>
+            A class to act as a mapping between the level that a logging call is made at and
+            the syslog severity that is should be logged at.
+            </summary>
+            <remarks>
+            <para>
+            A class to act as a mapping between the level that a logging call is made at and
+            the syslog severity that is should be logged at.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RemoteSyslogAppender.LevelSeverity.Severity">
+            <summary>
+            The mapped syslog severity for the specified level
+            </summary>
+            <remarks>
+            <para>
+            Required property.
+            The mapped syslog severity for the specified level
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RemotingAppender">
+            <summary>
+            Delivers logging events to a remote logging sink. 
+            </summary>
+            <remarks>
+            <para>
+            This Appender is designed to deliver events to a remote sink. 
+            That is any object that implements the <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
+            interface. It delivers the events using .NET remoting. The
+            object to deliver events to is specified by setting the
+            appenders <see cref="P:log4net.Appender.RemotingAppender.Sink"/> property.</para>
+            <para>
+            The RemotingAppender buffers events before sending them. This allows it to 
+            make more efficient use of the remoting infrastructure.</para>
+            <para>
+            Once the buffer is full the events are still not sent immediately. 
+            They are scheduled to be sent using a pool thread. The effect is that 
+            the send occurs asynchronously. This is very important for a 
+            number of non obvious reasons. The remoting infrastructure will 
+            flow thread local variables (stored in the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>),
+            if they are marked as <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>, across the 
+            remoting boundary. If the server is not contactable then
+            the remoting infrastructure will clear the <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>
+            objects from the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>. To prevent a logging failure from
+            having side effects on the calling application the remoting call must be made
+            from a separate thread to the one used by the application. A <see cref="T:System.Threading.ThreadPool"/>
+            thread is used for this. If no <see cref="T:System.Threading.ThreadPool"/> thread is available then
+            the events will block in the thread pool manager until a thread is available.</para>
+            <para>
+            Because the events are sent asynchronously using pool threads it is possible to close 
+            this appender before all the queued events have been sent.
+            When closing the appender attempts to wait until all the queued events have been sent, but 
+            this will timeout after 30 seconds regardless.</para>
+            <para>
+            If this appender is being closed because the <see cref="E:System.AppDomain.ProcessExit"/>
+            event has fired it may not be possible to send all the queued events. During process
+            exit the runtime limits the time that a <see cref="E:System.AppDomain.ProcessExit"/>
+            event handler is allowed to run for. If the runtime terminates the threads before
+            the queued events have been sent then they will be lost. To ensure that all events
+            are sent the appender must be closed before the application exits. See 
+            <see cref="M:log4net.Core.LoggerManager.Shutdown"/> for details on how to shutdown
+            log4net programmatically.</para>
+            </remarks>
+            <seealso cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Daniel Cazzulino</author>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.RemotingAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Send the contents of the buffer to the remote sink.
+            </summary>
+            <remarks>
+            The events are not sent immediately. They are scheduled to be sent
+            using a pool thread. The effect is that the send occurs asynchronously.
+            This is very important for a number of non obvious reasons. The remoting
+            infrastructure will flow thread local variables (stored in the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>),
+            if they are marked as <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>, across the 
+            remoting boundary. If the server is not contactable then
+            the remoting infrastructure will clear the <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>
+            objects from the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>. To prevent a logging failure from
+            having side effects on the calling application the remoting call must be made
+            from a separate thread to the one used by the application. A <see cref="T:System.Threading.ThreadPool"/>
+            thread is used for this. If no <see cref="T:System.Threading.ThreadPool"/> thread is available then
+            the events will block in the thread pool manager until a thread is available.
+            </remarks>
+            <param name="events">The events to send.</param>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.OnClose">
+            <summary>
+            Override base class close.
+            </summary>
+            <remarks>
+            <para>
+            This method waits while there are queued work items. The events are
+            sent asynchronously using <see cref="T:System.Threading.ThreadPool"/> work items. These items
+            will be sent once a thread pool thread is available to send them, therefore
+            it is possible to close the appender before all the queued events have been
+            sent.</para>
+            <para>
+            This method attempts to wait until all the queued events have been sent, but this 
+            method will timeout after 30 seconds regardless.</para>
+            <para>
+            If the appender is being closed because the <see cref="E:System.AppDomain.ProcessExit"/>
+            event has fired it may not be possible to send all the queued events. During process
+            exit the runtime limits the time that a <see cref="E:System.AppDomain.ProcessExit"/>
+            event handler is allowed to run for.</para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.BeginAsyncSend">
+            <summary>
+            A work item is being queued into the thread pool
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.EndAsyncSend">
+            <summary>
+            A work item from the thread pool has completed
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.SendBufferCallback(System.Object)">
+            <summary>
+            Send the contents of the buffer to the remote sink.
+            </summary>
+            <remarks>
+            This method is designed to be used with the <see cref="T:System.Threading.ThreadPool"/>.
+            This method expects to be passed an array of <see cref="T:log4net.Core.LoggingEvent"/>
+            objects in the state param.
+            </remarks>
+            <param name="state">the logging events to send</param>
+        </member>
+        <member name="F:log4net.Appender.RemotingAppender.m_sinkUrl">
+            <summary>
+            The URL of the remote sink.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemotingAppender.m_sinkObj">
+            <summary>
+            The local proxy (.NET remoting) for the remote logging sink.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemotingAppender.m_queuedCallbackCount">
+            <summary>
+            The number of queued callbacks currently waiting or executing
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RemotingAppender.m_workQueueEmptyEvent">
+            <summary>
+            Event used to signal when there are no queued work items
+            </summary>
+            <remarks>
+            This event is set when there are no queued work items. In this
+            state it is safe to close the appender.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RemotingAppender.Sink">
+            <summary>
+            Gets or sets the URL of the well-known object that will accept 
+            the logging events.
+            </summary>
+            <value>
+            The well-known URL of the remote sink.
+            </value>
+            <remarks>
+            <para>
+            The URL of the remoting sink that will accept logging events.
+            The sink must implement the <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
+            interface.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink">
+            <summary>
+            Interface used to deliver <see cref="T:log4net.Core.LoggingEvent"/> objects to a remote sink.
+            </summary>
+            <remarks>
+            This interface must be implemented by a remoting sink
+            if the <see cref="T:log4net.Appender.RemotingAppender"/> is to be used
+            to deliver logging events to the sink.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RemotingAppender.IRemoteLoggingSink.LogEvents(log4net.Core.LoggingEvent[])">
+            <summary>
+            Delivers logging events to the remote sink
+            </summary>
+            <param name="events">Array of events to log.</param>
+            <remarks>
+            <para>
+            Delivers logging events to the remote sink
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender">
+            <summary>
+            Appender that rolls log files based on size or date or both.
+            </summary>
+            <remarks>
+            <para>
+            RollingFileAppender can roll log files based on size or date or both
+            depending on the setting of the <see cref="P:log4net.Appender.RollingFileAppender.RollingStyle"/> property.
+            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Size"/> the log file will be rolled
+            once its size exceeds the <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/>.
+            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Date"/> the log file will be rolled
+            once the date boundary specified in the <see cref="P:log4net.Appender.RollingFileAppender.DatePattern"/> property
+            is crossed.
+            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Composite"/> the log file will be
+            rolled once the date boundary specified in the <see cref="P:log4net.Appender.RollingFileAppender.DatePattern"/> property
+            is crossed, but within a date boundary the file will also be rolled
+            once its size exceeds the <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/>.
+            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Once"/> the log file will be rolled when
+            the appender is configured. This effectively means that the log file can be
+            rolled once per program execution.
+            </para>
+            <para>
+            A of few additional optional features have been added:
+            <list type="bullet">
+            <item>Attach date pattern for current log file <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/></item>
+            <item>Backup number increments for newer files <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/></item>
+            <item>Infinite number of backups by file size <see cref="P:log4net.Appender.RollingFileAppender.MaxSizeRollBackups"/></item>
+            </list>
+            </para>
+            
+            <note>
+            <para>
+            For large or infinite numbers of backup files a <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> 
+            greater than zero is highly recommended, otherwise all the backup files need
+            to be renamed each time a new backup is created.
+            </para>
+            <para>
+            When Date/Time based rolling is used setting <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> 
+            to <see langword="true"/> will reduce the number of file renamings to few or none.
+            </para>
+            </note>
+            
+            <note type="caution">
+            <para>
+            Changing <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> or <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> without clearing
+            the log file directory of backup files will cause unexpected and unwanted side effects.  
+            </para>
+            </note>
+            
+            <para>
+            If Date/Time based rolling is enabled this appender will attempt to roll existing files
+            in the directory without a Date/Time tag based on the last write date of the base log file.
+            The appender only rolls the log file when a message is logged. If Date/Time based rolling 
+            is enabled then the appender will not roll the log file at the Date/Time boundary but
+            at the point when the next message is logged after the boundary has been crossed.
+            </para>
+            
+            <para>
+            The <see cref="T:log4net.Appender.RollingFileAppender"/> extends the <see cref="T:log4net.Appender.FileAppender"/> and
+            has the same behavior when opening the log file.
+            The appender will first try to open the file for writing when <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>
+            is called. This will typically be during configuration.
+            If the file cannot be opened for writing the appender will attempt
+            to open the file again each time a message is logged to the appender.
+            If the file cannot be opened for writing when a message is logged then
+            the message will be discarded by this appender.
+            </para>
+            <para>
+            When rolling a backup file necessitates deleting an older backup file the
+            file to be deleted is moved to a temporary name before being deleted.
+            </para>
+            
+            <note type="caution">
+            <para>
+            A maximum number of backup files when rolling on date/time boundaries is not supported.
+            </para>
+            </note>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Aspi Havewala</author>
+            <author>Douglas de la Torre</author>
+            <author>Edward Smit</author>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.RollingFileAppender"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.Finalize">
+            <summary>
+            Cleans up all resources used by this appender.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.declaringType">
+            <summary>
+            The fully qualified type of the RollingFileAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.SetQWForFiles(System.IO.TextWriter)">
+            <summary>
+            Sets the quiet writer being used.
+            </summary>
+            <remarks>
+            This method can be overridden by sub classes.
+            </remarks>
+            <param name="writer">the writer to set</param>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Write out a logging event.
+            </summary>
+            <param name="loggingEvent">the event to write to file.</param>
+            <remarks>
+            <para>
+            Handles append time behavior for RollingFileAppender.  This checks
+            if a roll over either by date (checked first) or time (checked second)
+            is need and then appends to the file last.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.Append(log4net.Core.LoggingEvent[])">
+            <summary>
+            Write out an array of logging events.
+            </summary>
+            <param name="loggingEvents">the events to write to file.</param>
+            <remarks>
+            <para>
+            Handles append time behavior for RollingFileAppender.  This checks
+            if a roll over either by date (checked first) or time (checked second)
+            is need and then appends to the file last.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.AdjustFileBeforeAppend">
+            <summary>
+            Performs any required rolling before outputting the next event
+            </summary>
+            <remarks>
+            <para>
+            Handles append time behavior for RollingFileAppender.  This checks
+            if a roll over either by date (checked first) or time (checked second)
+            is need and then appends to the file last.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.OpenFile(System.String,System.Boolean)">
+            <summary>
+            Creates and opens the file for logging.  If <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/>
+            is false then the fully qualified name is determined and used.
+            </summary>
+            <param name="fileName">the name of the file to open</param>
+            <param name="append">true to append to existing file</param>
+            <remarks>
+            <para>This method will ensure that the directory structure
+            for the <paramref name="fileName"/> specified exists.</para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.GetNextOutputFileName(System.String)">
+            <summary>
+            Get the current output file name
+            </summary>
+            <param name="fileName">the base file name</param>
+            <returns>the output file name</returns>
+            <remarks>
+            The output file name is based on the base fileName specified.
+            If <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> is set then the output 
+            file name is the same as the base file passed in. Otherwise
+            the output file depends on the date pattern, on the count
+            direction or both.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.DetermineCurSizeRollBackups">
+            <summary>
+            Determines curSizeRollBackups (only within the current roll point)
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.GetWildcardPatternForFile(System.String)">
+            <summary>
+            Generates a wildcard pattern that can be used to find all files
+            that are similar to the base file name.
+            </summary>
+            <param name="baseFileName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.GetExistingFiles(System.String)">
+            <summary>
+            Builds a list of filenames for all files matching the base filename plus a file
+            pattern.
+            </summary>
+            <param name="baseFilePath"></param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.RollOverIfDateBoundaryCrossing">
+            <summary>
+            Initiates a roll over if needed for crossing a date boundary since the last run.
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.ExistingInit">
+            <summary>
+            Initializes based on existing conditions at time of <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>.
+            </summary>
+            <remarks>
+            <para>
+            Initializes based on existing conditions at time of <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>.
+            The following is done
+            <list type="bullet">
+            <item>determine curSizeRollBackups (only within the current roll point)</item>
+            <item>initiates a roll over if needed for crossing a date boundary since the last run.</item>
+            </list>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.InitializeFromOneFile(System.String,System.String)">
+            <summary>
+            Does the work of bumping the 'current' file counter higher
+            to the highest count when an incremental file name is seen.
+            The highest count is either the first file (when count direction
+            is greater than 0) or the last file (when count direction less than 0).
+            In either case, we want to know the highest count that is present.
+            </summary>
+            <param name="baseFile"></param>
+            <param name="curFileName"></param>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.GetBackUpIndex(System.String)">
+            <summary>
+            Attempts to extract a number from the end of the file name that indicates
+            the number of the times the file has been rolled over.
+            </summary>
+            <remarks>
+            Certain date pattern extensions like yyyyMMdd will be parsed as valid backup indexes.
+            </remarks>
+            <param name="curFileName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.InitializeRollBackups(System.String,System.Collections.ArrayList)">
+            <summary>
+            Takes a list of files and a base file name, and looks for 
+            'incremented' versions of the base file.  Bumps the max
+            count up to the highest count seen.
+            </summary>
+            <param name="baseFile"></param>
+            <param name="arrayFiles"></param>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.ComputeCheckPeriod(System.String)">
+            <summary>
+            Calculates the RollPoint for the datePattern supplied.
+            </summary>
+            <param name="datePattern">the date pattern to calculate the check period for</param>
+            <returns>The RollPoint that is most accurate for the date pattern supplied</returns>
+            <remarks>
+            Essentially the date pattern is examined to determine what the
+            most suitable roll point is. The roll point chosen is the roll point
+            with the smallest period that can be detected using the date pattern
+            supplied. i.e. if the date pattern only outputs the year, month, day 
+            and hour then the smallest roll point that can be detected would be
+            and hourly roll point as minutes could not be detected.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            Sets initial conditions including date/time roll over information, first check,
+            scheduledFilename, and calls <see cref="M:log4net.Appender.RollingFileAppender.ExistingInit"/> to initialize
+            the current number of backups.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.CombinePath(System.String,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="path1"></param>
+            <param name="path2">.1, .2, .3, etc.</param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.RollOverTime(System.Boolean)">
+            <summary>
+            Rollover the file(s) to date/time tagged file(s).
+            </summary>
+            <param name="fileIsOpen">set to true if the file to be rolled is currently open</param>
+            <remarks>
+            <para>
+            Rollover the file(s) to date/time tagged file(s).
+            Resets curSizeRollBackups. 
+            If fileIsOpen is set then the new file is opened (through SafeOpenFile).
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.RollFile(System.String,System.String)">
+            <summary>
+            Renames file <paramref name="fromFile"/> to file <paramref name="toFile"/>.
+            </summary>
+            <param name="fromFile">Name of existing file to roll.</param>
+            <param name="toFile">New name for file.</param>
+            <remarks>
+            <para>
+            Renames file <paramref name="fromFile"/> to file <paramref name="toFile"/>. It
+            also checks for existence of target file and deletes if it does.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.FileExists(System.String)">
+            <summary>
+            Test if a file exists at a specified path
+            </summary>
+            <param name="path">the path to the file</param>
+            <returns>true if the file exists</returns>
+            <remarks>
+            <para>
+            Test if a file exists at a specified path
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.DeleteFile(System.String)">
+            <summary>
+            Deletes the specified file if it exists.
+            </summary>
+            <param name="fileName">The file to delete.</param>
+            <remarks>
+            <para>
+            Delete a file if is exists.
+            The file is first moved to a new filename then deleted.
+            This allows the file to be removed even when it cannot
+            be deleted, but it still can be moved.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.RollOverSize">
+            <summary>
+            Implements file roll base on file size.
+            </summary>
+            <remarks>
+            <para>
+            If the maximum number of size based backups is reached
+            (<c>curSizeRollBackups == maxSizeRollBackups</c>) then the oldest
+            file is deleted -- its index determined by the sign of countDirection.
+            If <c>countDirection</c> &lt; 0, then files
+            {<c>File.1</c>, ..., <c>File.curSizeRollBackups -1</c>}
+            are renamed to {<c>File.2</c>, ...,
+            <c>File.curSizeRollBackups</c>}. Moreover, <c>File</c> is
+            renamed <c>File.1</c> and closed.
+            </para>
+            <para>
+            A new file is created to receive further log output.
+            </para>
+            <para>
+            If <c>maxSizeRollBackups</c> is equal to zero, then the
+            <c>File</c> is truncated with no backup files created.
+            </para>
+            <para>
+            If <c>maxSizeRollBackups</c> &lt; 0, then <c>File</c> is
+            renamed if needed and no files are deleted.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.RollOverRenameFiles(System.String)">
+            <summary>
+            Implements file roll.
+            </summary>
+            <param name="baseFileName">the base name to rename</param>
+            <remarks>
+            <para>
+            If the maximum number of size based backups is reached
+            (<c>curSizeRollBackups == maxSizeRollBackups</c>) then the oldest
+            file is deleted -- its index determined by the sign of countDirection.
+            If <c>countDirection</c> &lt; 0, then files
+            {<c>File.1</c>, ..., <c>File.curSizeRollBackups -1</c>}
+            are renamed to {<c>File.2</c>, ...,
+            <c>File.curSizeRollBackups</c>}. 
+            </para>
+            <para>
+            If <c>maxSizeRollBackups</c> is equal to zero, then the
+            <c>File</c> is truncated with no backup files created.
+            </para>
+            <para>
+            If <c>maxSizeRollBackups</c> &lt; 0, then <c>File</c> is
+            renamed if needed and no files are deleted.
+            </para>
+            <para>
+            This is called by <see cref="M:log4net.Appender.RollingFileAppender.RollOverSize"/> to rename the files.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.RollingFileAppender.NextCheckDate(System.DateTime,log4net.Appender.RollingFileAppender.RollPoint)">
+            <summary>
+            Get the start time of the next window for the current rollpoint
+            </summary>
+            <param name="currentDateTime">the current date</param>
+            <param name="rollPoint">the type of roll point we are working with</param>
+            <returns>the start time for the next roll point an interval after the currentDateTime date</returns>
+            <remarks>
+            <para>
+            Returns the date of the next roll point after the currentDateTime date passed to the method.
+            </para>
+            <para>
+            The basic strategy is to subtract the time parts that are less significant
+            than the rollpoint from the current time. This should roll the time back to
+            the start of the time window for the current rollpoint. Then we add 1 window
+            worth of time and get the start time of the next window for the rollpoint.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_dateTime">
+            <summary>
+            This object supplies the current date/time.  Allows test code to plug in
+            a method to control this class when testing date/time based rolling. The default
+            implementation uses the underlying value of DateTime.Now.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_datePattern">
+            <summary>
+            The date pattern. By default, the pattern is set to <c>".yyyy-MM-dd"</c> 
+            meaning daily rollover.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_scheduledFilename">
+            <summary>
+            The actual formatted filename that is currently being written to
+            or will be the file transferred to on roll over
+            (based on staticLogFileName).
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_nextCheck">
+            <summary>
+            The timestamp when we shall next recompute the filename.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_now">
+            <summary>
+            Holds date of last roll over
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_rollPoint">
+            <summary>
+            The type of rolling done
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_maxFileSize">
+            <summary>
+            The default maximum file size is 10MB
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_maxSizeRollBackups">
+            <summary>
+            There is zero backup files by default
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_curSizeRollBackups">
+            <summary>
+            How many sized based backups have been made so far
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_countDirection">
+            <summary>
+            The rolling file count direction. 
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_rollingStyle">
+            <summary>
+            The rolling mode used in this appender.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_rollDate">
+            <summary>
+            Cache flag set if we are rolling by date.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_rollSize">
+            <summary>
+            Cache flag set if we are rolling by size.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_staticLogFileName">
+            <summary>
+            Value indicating whether to always log to the same file.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_preserveLogFileNameExtension">
+            <summary>
+            Value indicating whether to preserve the file name extension when rolling.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_baseFileName">
+            <summary>
+            FileName provided in configuration.  Used for rolling properly
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.m_mutexForRolling">
+            <summary>
+            A mutex that is used to lock rolling of files.
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.s_date1970">
+            <summary>
+            The 1st of January 1970 in UTC
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.DateTimeStrategy">
+            <summary>
+            Gets or sets the strategy for determining the current date and time. The default
+            implementation is to use LocalDateTime which internally calls through to DateTime.Now. 
+            DateTime.UtcNow may be used on frameworks newer than .NET 1.0 by specifying
+            <see cref="T:log4net.Appender.RollingFileAppender.UniversalDateTime"/>.
+            </summary>
+            <value>
+            An implementation of the <see cref="T:log4net.Appender.RollingFileAppender.IDateTime"/> interface which returns the current date and time.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the <see cref="T:log4net.Appender.RollingFileAppender.IDateTime"/> used to return the current date and time.
+            </para>
+            <para>
+            There are two built strategies for determining the current date and time, 
+            <see cref="T:log4net.Appender.RollingFileAppender.LocalDateTime"/>
+            and <see cref="T:log4net.Appender.RollingFileAppender.UniversalDateTime"/>.
+            </para>
+            <para>
+            The default strategy is <see cref="T:log4net.Appender.RollingFileAppender.LocalDateTime"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.DatePattern">
+            <summary>
+            Gets or sets the date pattern to be used for generating file names
+            when rolling over on date.
+            </summary>
+            <value>
+            The date pattern to be used for generating file names when rolling 
+            over on date.
+            </value>
+            <remarks>
+            <para>
+            Takes a string in the same format as expected by 
+            <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/>.
+            </para>
+            <para>
+            This property determines the rollover schedule when rolling over
+            on date.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.MaxSizeRollBackups">
+            <summary>
+            Gets or sets the maximum number of backup files that are kept before
+            the oldest is erased.
+            </summary>
+            <value>
+            The maximum number of backup files that are kept before the oldest is
+            erased.
+            </value>
+            <remarks>
+            <para>
+            If set to zero, then there will be no backup files and the log file 
+            will be truncated when it reaches <see cref="P:log4net.Appender.RollingFileAppender.MaxFileSize"/>.  
+            </para>
+            <para>
+            If a negative number is supplied then no deletions will be made.  Note 
+            that this could result in very slow performance as a large number of 
+            files are rolled over unless <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> is used.
+            </para>
+            <para>
+            The maximum applies to <b>each</b> time based group of files and 
+            <b>not</b> the total.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.MaxFileSize">
+            <summary>
+            Gets or sets the maximum size that the output file is allowed to reach
+            before being rolled over to backup files.
+            </summary>
+            <value>
+            The maximum size in bytes that the output file is allowed to reach before being 
+            rolled over to backup files.
+            </value>
+            <remarks>
+            <para>
+            This property is equivalent to <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/> except
+            that it is required for differentiating the setter taking a
+            <see cref="T:System.Int64"/> argument from the setter taking a <see cref="T:System.String"/> 
+            argument.
+            </para>
+            <para>
+            The default maximum file size is 10MB (10*1024*1024).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.MaximumFileSize">
+            <summary>
+            Gets or sets the maximum size that the output file is allowed to reach
+            before being rolled over to backup files.
+            </summary>
+            <value>
+            The maximum size that the output file is allowed to reach before being 
+            rolled over to backup files.
+            </value>
+            <remarks>
+            <para>
+            This property allows you to specify the maximum size with the
+            suffixes "KB", "MB" or "GB" so that the size is interpreted being 
+            expressed respectively in kilobytes, megabytes or gigabytes. 
+            </para>
+            <para>
+            For example, the value "10KB" will be interpreted as 10240 bytes.
+            </para>
+            <para>
+            The default maximum file size is 10MB.
+            </para>
+            <para>
+            If you have the option to set the maximum file size programmatically
+            consider using the <see cref="P:log4net.Appender.RollingFileAppender.MaxFileSize"/> property instead as this
+            allows you to set the size in bytes as a <see cref="T:System.Int64"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.CountDirection">
+            <summary>
+            Gets or sets the rolling file count direction. 
+            </summary>
+            <value>
+            The rolling file count direction.
+            </value>
+            <remarks>
+            <para>
+            Indicates if the current file is the lowest numbered file or the
+            highest numbered file.
+            </para>
+            <para>
+            By default newer files have lower numbers (<see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &lt; 0),
+            i.e. log.1 is most recent, log.5 is the 5th backup, etc...
+            </para>
+            <para>
+            <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &gt;= 0 does the opposite i.e.
+            log.1 is the first backup made, log.5 is the 5th backup made, etc.
+            For infinite backups use <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &gt;= 0 to reduce 
+            rollover costs.
+            </para>
+            <para>The default file count direction is -1.</para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.RollingStyle">
+            <summary>
+            Gets or sets the rolling style.
+            </summary>
+            <value>The rolling style.</value>
+            <remarks>
+            <para>
+            The default rolling style is <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Composite"/>.
+            </para>
+            <para>
+            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Once"/> this appender's
+            <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property is set to <c>false</c>, otherwise
+            the appender would append to a single file rather than rolling
+            the file each time it is opened.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.PreserveLogFileNameExtension">
+            <summary>
+            Gets or sets a value indicating whether to preserve the file name extension when rolling.
+            </summary>
+            <value>
+            <c>true</c> if the file name extension should be preserved.
+            </value>
+            <remarks>
+            <para>
+            By default file.log is rolled to file.log.yyyy-MM-dd or file.log.curSizeRollBackup.
+            However, under Windows the new file name will loose any program associations as the
+            extension is changed. Optionally file.log can be renamed to file.yyyy-MM-dd.log or
+            file.curSizeRollBackup.log to maintain any program associations.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.StaticLogFileName">
+            <summary>
+            Gets or sets a value indicating whether to always log to
+            the same file.
+            </summary>
+            <value>
+            <c>true</c> if always should be logged to the same file, otherwise <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            By default file.log is always the current file.  Optionally
+            file.log.yyyy-mm-dd for current formatted datePattern can by the currently
+            logging file (or file.log.curSizeRollBackup or even
+            file.log.yyyy-mm-dd.curSizeRollBackup).
+            </para>
+            <para>
+            This will make time based rollovers with a large number of backups 
+            much faster as the appender it won't have to rename all the backups!
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender.RollingMode">
+            <summary>
+            Style of rolling to use
+            </summary>
+            <remarks>
+            <para>
+            Style of rolling to use
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Once">
+            <summary>
+            Roll files once per program execution
+            </summary>
+            <remarks>
+            <para>
+            Roll files once per program execution.
+            Well really once each time this appender is
+            configured.
+            </para>
+            <para>
+            Setting this option also sets <c>AppendToFile</c> to
+            <c>false</c> on the <c>RollingFileAppender</c>, otherwise
+            this appender would just be a normal file appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Size">
+            <summary>
+            Roll files based only on the size of the file
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Date">
+            <summary>
+            Roll files based only on the date
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Composite">
+            <summary>
+            Roll files based on both the size and date of the file
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender.RollPoint">
+            <summary>
+            The code assumes that the following 'time' constants are in a increasing sequence.
+            </summary>
+            <remarks>
+            <para>
+            The code assumes that the following 'time' constants are in a increasing sequence.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.InvalidRollPoint">
+            <summary>
+            Roll the log not based on the date
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfMinute">
+            <summary>
+            Roll the log for each minute
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfHour">
+            <summary>
+            Roll the log for each hour
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.HalfDay">
+            <summary>
+            Roll the log twice a day (midday and midnight)
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfDay">
+            <summary>
+            Roll the log each day (midnight)
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfWeek">
+            <summary>
+            Roll the log each week
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfMonth">
+            <summary>
+            Roll the log each month
+            </summary>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender.IDateTime">
+            <summary>
+            This interface is used to supply Date/Time information to the <see cref="T:log4net.Appender.RollingFileAppender"/>.
+            </summary>
+            <remarks>
+            This interface is used to supply Date/Time information to the <see cref="T:log4net.Appender.RollingFileAppender"/>.
+            Used primarily to allow test classes to plug themselves in so they can
+            supply test date/times.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.IDateTime.Now">
+            <summary>
+            Gets the <i>current</i> time.
+            </summary>
+            <value>The <i>current</i> time.</value>
+            <remarks>
+            <para>
+            Gets the <i>current</i> time.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender.LocalDateTime">
+            <summary>
+            Default implementation of <see cref="T:log4net.Appender.RollingFileAppender.IDateTime"/> that returns the current time.
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.LocalDateTime.Now">
+            <summary>
+            Gets the <b>current</b> time.
+            </summary>
+            <value>The <b>current</b> time.</value>
+            <remarks>
+            <para>
+            Gets the <b>current</b> time.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.RollingFileAppender.UniversalDateTime">
+            <summary>
+            Implementation of <see cref="T:log4net.Appender.RollingFileAppender.IDateTime"/> that returns the current time as the coordinated universal time (UTC).
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.RollingFileAppender.UniversalDateTime.Now">
+            <summary>
+            Gets the <b>current</b> time.
+            </summary>
+            <value>The <b>current</b> time.</value>
+            <remarks>
+            <para>
+            Gets the <b>current</b> time.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.SmtpAppender">
+            <summary>
+            Send an e-mail when a specific logging event occurs, typically on errors 
+            or fatal errors.
+            </summary>
+            <remarks>
+            <para>
+            The number of logging events delivered in this e-mail depend on
+            the value of <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option. The
+            <see cref="T:log4net.Appender.SmtpAppender"/> keeps only the last
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> logging events in its 
+            cyclic buffer. This keeps memory requirements at a reasonable level while 
+            still delivering useful application context.
+            </para>
+            <note type="caution">
+            Authentication and setting the server Port are only available on the MS .NET 1.1 runtime.
+            For these features to be enabled you need to ensure that you are using a version of
+            the log4net assembly that is built against the MS .NET 1.1 framework and that you are
+            running the your application on the MS .NET 1.1 runtime. On all other platforms only sending
+            unauthenticated messages to a server listening on port 25 (the default) is supported.
+            </note>
+            <para>
+            Authentication is supported by setting the <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> property to
+            either <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> or <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/>.
+            If using <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> authentication then the <see cref="P:log4net.Appender.SmtpAppender.Username"/>
+            and <see cref="P:log4net.Appender.SmtpAppender.Password"/> properties must also be set.
+            </para>
+            <para>
+            To set the SMTP server port use the <see cref="P:log4net.Appender.SmtpAppender.Port"/> property. The default port is 25.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Appender.SmtpAppender.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.SmtpAppender.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Sends the contents of the cyclic buffer as an e-mail message.
+            </summary>
+            <param name="events">The logging events to send.</param>
+        </member>
+        <member name="M:log4net.Appender.SmtpAppender.SendEmail(System.String)">
+            <summary>
+            Send the email message
+            </summary>
+            <param name="messageBody">the body text to include in the mail</param>
+        </member>
+        <member name="M:log4net.Appender.SmtpAppender.MaybeTrimSeparators(System.String)">
+            <summary>
+              trims leading and trailing commas or semicolons
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.To">
+            <summary>
+            Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses (use semicolon on .NET 1.1 and comma for later versions).
+            </summary>
+            <value>
+            <para>
+            For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses.
+            </para>
+            <para>
+            For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses.
+            </para>
+            </value>
+            <remarks>
+            <para>
+            For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses.
+            </para>
+            <para>
+            For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Cc">
+            <summary>
+            Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses 
+            that will be carbon copied (use semicolon on .NET 1.1 and comma for later versions).
+            </summary>
+            <value>
+            <para>
+            For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses.
+            </para>
+            <para>
+            For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses.
+            </para>
+            </value>
+            <remarks>
+            <para>
+            For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses.
+            </para>
+            <para>
+            For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Bcc">
+            <summary>
+            Gets or sets a semicolon-delimited list of recipient e-mail addresses
+            that will be blind carbon copied.
+            </summary>
+            <value>
+            A semicolon-delimited list of e-mail addresses.
+            </value>
+            <remarks>
+            <para>
+            A semicolon-delimited list of recipient e-mail addresses.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.From">
+            <summary>
+            Gets or sets the e-mail address of the sender.
+            </summary>
+            <value>
+            The e-mail address of the sender.
+            </value>
+            <remarks>
+            <para>
+            The e-mail address of the sender.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Subject">
+            <summary>
+            Gets or sets the subject line of the e-mail message.
+            </summary>
+            <value>
+            The subject line of the e-mail message.
+            </value>
+            <remarks>
+            <para>
+            The subject line of the e-mail message.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.SmtpHost">
+            <summary>
+            Gets or sets the name of the SMTP relay mail server to use to send 
+            the e-mail messages.
+            </summary>
+            <value>
+            The name of the e-mail relay server. If SmtpServer is not set, the 
+            name of the local SMTP server is used.
+            </value>
+            <remarks>
+            <para>
+            The name of the e-mail relay server. If SmtpServer is not set, the 
+            name of the local SMTP server is used.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.LocationInfo">
+            <summary>
+            Obsolete
+            </summary>
+            <remarks>
+            Use the BufferingAppenderSkeleton Fix methods instead 
+            </remarks>
+            <remarks>
+            <para>
+            Obsolete property.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Authentication">
+            <summary>
+            The mode to use to authentication with the SMTP server
+            </summary>
+            <remarks>
+            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
+            <para>
+            Valid Authentication mode values are: <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None"/>, 
+            <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, and <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/>. 
+            The default value is <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None"/>. When using 
+            <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> you must specify the <see cref="P:log4net.Appender.SmtpAppender.Username"/> 
+            and <see cref="P:log4net.Appender.SmtpAppender.Password"/> to use to authenticate.
+            When using <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/> the Windows credentials for the current
+            thread, if impersonating, or the process will be used to authenticate. 
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Username">
+            <summary>
+            The username to use to authenticate with the SMTP server
+            </summary>
+            <remarks>
+            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
+            <para>
+            A <see cref="P:log4net.Appender.SmtpAppender.Username"/> and <see cref="P:log4net.Appender.SmtpAppender.Password"/> must be specified when 
+            <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> is set to <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, 
+            otherwise the username will be ignored. 
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Password">
+            <summary>
+            The password to use to authenticate with the SMTP server
+            </summary>
+            <remarks>
+            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
+            <para>
+            A <see cref="P:log4net.Appender.SmtpAppender.Username"/> and <see cref="P:log4net.Appender.SmtpAppender.Password"/> must be specified when 
+            <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> is set to <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, 
+            otherwise the password will be ignored. 
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Port">
+            <summary>
+            The port on which the SMTP server is listening
+            </summary>
+            <remarks>
+            <note type="caution">Server Port is only available on the MS .NET 1.1 runtime.</note>
+            <para>
+            The port on which the SMTP server is listening. The default
+            port is <c>25</c>. The Port can only be changed when running on
+            the MS .NET 1.1 runtime.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.Priority">
+            <summary>
+            Gets or sets the priority of the e-mail message
+            </summary>
+            <value>
+            One of the <see cref="T:System.Net.Mail.MailPriority"/> values.
+            </value>
+            <remarks>
+            <para>
+            Sets the priority of the e-mails generated by this
+            appender. The default priority is <see cref="F:System.Net.Mail.MailPriority.Normal"/>.
+            </para>
+            <para>
+            If you are using this appender to report errors then
+            you may want to set the priority to <see cref="F:System.Net.Mail.MailPriority.High"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.EnableSsl">
+            <summary>
+            Enable or disable use of SSL when sending e-mail message
+            </summary>
+            <remarks>
+            This is available on MS .NET 2.0 runtime and higher
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.ReplyTo">
+            <summary>
+            Gets or sets the reply-to e-mail address.
+            </summary>
+            <remarks>
+            This is available on MS .NET 2.0 runtime and higher
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.SubjectEncoding">
+            <summary>
+            Gets or sets the subject encoding to be used.
+            </summary>
+            <remarks>
+            The default encoding is the operating system's current ANSI codepage.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.BodyEncoding">
+            <summary>
+            Gets or sets the body encoding to be used.
+            </summary>
+            <remarks>
+            The default encoding is the operating system's current ANSI codepage.
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.SmtpAppender.SmtpAuthentication">
+            <summary>
+            Values for the <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> property.
+            </summary>
+            <remarks>
+            <para>
+            SMTP authentication modes.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None">
+            <summary>
+            No authentication
+            </summary>
+        </member>
+        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic">
+            <summary>
+            Basic authentication.
+            </summary>
+            <remarks>
+            Requires a username and password to be supplied
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm">
+            <summary>
+            Integrated authentication
+            </summary>
+            <remarks>
+            Uses the Windows credentials from the current thread or process to authenticate.
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.SmtpPickupDirAppender">
+            <summary>
+            Send an email when a specific logging event occurs, typically on errors 
+            or fatal errors. Rather than sending via smtp it writes a file into the
+            directory specified by <see cref="P:log4net.Appender.SmtpPickupDirAppender.PickupDir"/>. This allows services such
+            as the IIS SMTP agent to manage sending the messages.
+            </summary>
+            <remarks>
+            <para>
+            The configuration for this appender is identical to that of the <c>SMTPAppender</c>,
+            except that instead of specifying the <c>SMTPAppender.SMTPHost</c> you specify
+            <see cref="P:log4net.Appender.SmtpPickupDirAppender.PickupDir"/>.
+            </para>
+            <para>
+            The number of logging events delivered in this e-mail depend on
+            the value of <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option. The
+            <see cref="T:log4net.Appender.SmtpPickupDirAppender"/> keeps only the last
+            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> logging events in its 
+            cyclic buffer. This keeps memory requirements at a reasonable level while 
+            still delivering useful application context.
+            </para>
+            </remarks>
+            <author>Niall Daley</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.SmtpPickupDirAppender.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.SmtpPickupDirAppender.SendBuffer(log4net.Core.LoggingEvent[])">
+            <summary>
+            Sends the contents of the cyclic buffer as an e-mail message.
+            </summary>
+            <param name="events">The logging events to send.</param>
+            <remarks>
+            <para>
+            Sends the contents of the cyclic buffer as an e-mail message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions">
+            <summary>
+            Activate the options on this appender. 
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.SmtpPickupDirAppender.ConvertToFullPath(System.String)">
+            <summary>
+            Convert a path into a fully qualified path.
+            </summary>
+            <param name="path">The path to convert.</param>
+            <returns>The fully qualified path.</returns>
+            <remarks>
+            <para>
+            Converts the path specified to a fully
+            qualified path. If the path is relative it is
+            taken as relative from the application base 
+            directory.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.SmtpPickupDirAppender.m_securityContext">
+            <summary>
+            The security context to use for privileged calls
+            </summary>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.To">
+            <summary>
+            Gets or sets a semicolon-delimited list of recipient e-mail addresses.
+            </summary>
+            <value>
+            A semicolon-delimited list of e-mail addresses.
+            </value>
+            <remarks>
+            <para>
+            A semicolon-delimited list of e-mail addresses.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.From">
+            <summary>
+            Gets or sets the e-mail address of the sender.
+            </summary>
+            <value>
+            The e-mail address of the sender.
+            </value>
+            <remarks>
+            <para>
+            The e-mail address of the sender.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.Subject">
+            <summary>
+            Gets or sets the subject line of the e-mail message.
+            </summary>
+            <value>
+            The subject line of the e-mail message.
+            </value>
+            <remarks>
+            <para>
+            The subject line of the e-mail message.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.PickupDir">
+            <summary>
+            Gets or sets the path to write the messages to.
+            </summary>
+            <remarks>
+            <para>
+            Gets or sets the path to write the messages to. This should be the same
+            as that used by the agent sending the messages.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.FileExtension">
+            <summary>
+            Gets or sets the file extension for the generated files
+            </summary>
+            <value>
+            The file extension for the generated files
+            </value>
+            <remarks>
+            <para>
+            The file extension for the generated files
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> used to write to the pickup directory.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> used to write to the pickup directory.
+            </value>
+            <remarks>
+            <para>
+            Unless a <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> specified here for this appender
+            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
+            security context to use. The default behavior is to use the security context
+            of the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.SmtpPickupDirAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.TelnetAppender">
+            <summary>
+            Appender that allows clients to connect via Telnet to receive log messages
+            </summary>
+            <remarks>	
+            <para>
+            The TelnetAppender accepts socket connections and streams logging messages
+            back to the client.  
+            The output is provided in a telnet-friendly way so that a log can be monitored 
+            over a TCP/IP socket.
+            This allows simple remote monitoring of application logging.
+            </para>
+            <para>
+            The default <see cref="P:log4net.Appender.TelnetAppender.Port"/> is 23 (the telnet port).
+            </para>
+            </remarks>
+            <author>Keith Long</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.TelnetAppender.declaringType">
+            <summary>
+            The fully qualified type of the TelnetAppender class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.OnClose">
+            <summary>
+            Overrides the parent method to close the socket handler
+            </summary>
+            <remarks>
+            <para>
+            Closes all the outstanding connections.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.ActivateOptions">
+            <summary>
+            Initialize the appender based on the options set.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            Create the socket handler and wait for connections
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Writes the logging event to each connected client.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the logging event to each connected client.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TelnetAppender.Port">
+            <summary>
+            Gets or sets the TCP port number on which this <see cref="T:log4net.Appender.TelnetAppender"/> will listen for connections.
+            </summary>
+            <value>
+            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
+            indicating the TCP port number on which this <see cref="T:log4net.Appender.TelnetAppender"/> will listen for connections.
+            </value>
+            <remarks>
+            <para>
+            The default value is 23 (the telnet port).
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> 
+            or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
+        </member>
+        <member name="P:log4net.Appender.TelnetAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.TelnetAppender.SocketHandler">
+            <summary>
+            Helper class to manage connected clients
+            </summary>
+            <remarks>
+            <para>
+            The SocketHandler class is used to accept connections from
+            clients.  It is threaded so that clients can connect/disconnect
+            asynchronously.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.#ctor(System.Int32)">
+            <summary>
+            Opens a new server port on <paramref ref="port"/>
+            </summary>
+            <param name="port">the local port to listen on for connections</param>
+            <remarks>
+            <para>
+            Creates a socket handler on the specified local server port.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.Send(System.String)">
+            <summary>
+            Sends a string message to each of the connected clients
+            </summary>
+            <param name="message">the text to send</param>
+            <remarks>
+            <para>
+            Sends a string message to each of the connected clients
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.AddClient(log4net.Appender.TelnetAppender.SocketHandler.SocketClient)">
+            <summary>
+            Add a client to the internal clients list
+            </summary>
+            <param name="client">client to add</param>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.RemoveClient(log4net.Appender.TelnetAppender.SocketHandler.SocketClient)">
+            <summary>
+            Remove a client from the internal clients list
+            </summary>
+            <param name="client">client to remove</param>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.OnConnect(System.IAsyncResult)">
+            <summary>
+            Callback used to accept a connection on the server socket
+            </summary>
+            <param name="asyncResult">The result of the asynchronous operation</param>
+            <remarks>
+            <para>
+            On connection adds to the list of connections 
+            if there are two many open connections you will be disconnected
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.Dispose">
+            <summary>
+            Close all network connections
+            </summary>
+            <remarks>
+            <para>
+            Make sure we close all network connections
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TelnetAppender.SocketHandler.HasConnections">
+            <summary>
+            Test if this handler has active connections
+            </summary>
+            <value>
+            <c>true</c> if this handler has active connections
+            </value>
+            <remarks>
+            <para>
+            This property will be <c>true</c> while this handler has
+            active connections, that is at least one connection that 
+            the handler will attempt to send a message to.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.TelnetAppender.SocketHandler.SocketClient">
+            <summary>
+            Class that represents a client connected to this handler
+            </summary>
+            <remarks>
+            <para>
+            Class that represents a client connected to this handler
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.#ctor(System.Net.Sockets.Socket)">
+            <summary>
+            Create this <see cref="T:log4net.Appender.TelnetAppender.SocketHandler.SocketClient"/> for the specified <see cref="T:System.Net.Sockets.Socket"/>
+            </summary>
+            <param name="socket">the client's socket</param>
+            <remarks>
+            <para>
+            Opens a stream writer on the socket.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.Send(System.String)">
+            <summary>
+            Write a string to the client
+            </summary>
+            <param name="message">string to send</param>
+            <remarks>
+            <para>
+            Write a string to the client
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.Dispose">
+            <summary>
+            Cleanup the clients connection
+            </summary>
+            <remarks>
+            <para>
+            Close the socket connection.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Appender.TraceAppender">
+            <summary>
+            Appends log events to the <see cref="T:System.Diagnostics.Trace"/> system.
+            </summary>
+            <remarks>
+            <para>
+            The application configuration file can be used to control what listeners 
+            are actually used. See the MSDN documentation for the 
+            <see cref="T:System.Diagnostics.Trace"/> class for details on configuring the
+            trace system.
+            </para>
+            <para>
+            Events are written using the <c>System.Diagnostics.Trace.Write(string,string)</c>
+            method. The event's logger name is the default value for the category parameter 
+            of the Write method. 
+            </para>
+            <para>
+            <b>Compact Framework</b><br/>
+            The Compact Framework does not support the <see cref="T:System.Diagnostics.Trace"/>
+            class for any operation except <c>Assert</c>. When using the Compact Framework this
+            appender will write to the <see cref="T:System.Diagnostics.Debug"/> system rather than
+            the Trace system. This appender will therefore behave like the <see cref="T:log4net.Appender.DebugAppender"/>.
+            </para>
+            </remarks>
+            <author>Douglas de la Torre</author>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Appender.TraceAppender.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.TraceAppender"/>.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TraceAppender.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Appender.TraceAppender"/> 
+            with a specified layout.
+            </summary>
+            <param name="layout">The layout to use with this appender.</param>
+            <remarks>
+            <para>
+            Obsolete constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Appender.TraceAppender.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Writes the logging event to the <see cref="T:System.Diagnostics.Trace"/> system.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Writes the logging event to the <see cref="T:System.Diagnostics.Trace"/> system.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.TraceAppender.m_immediateFlush">
+            <summary>
+            Immediate flush means that the underlying writer or output stream
+            will be flushed at the end of each append operation.
+            </summary>
+            <remarks>
+            <para>
+            Immediate flush is slower but ensures that each append request is 
+            actually written. If <see cref="P:log4net.Appender.TraceAppender.ImmediateFlush"/> is set to
+            <c>false</c>, then there is a good chance that the last few
+            logs events are not actually written to persistent media if and
+            when the application crashes.
+            </para>
+            <para>
+            The default value is <c>true</c>.</para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Appender.TraceAppender.m_category">
+            <summary>
+            Defaults to %logger
+            </summary>
+        </member>
+        <member name="M:log4net.Appender.TraceAppender.Flush(System.Int32)">
+            <summary>
+            Flushes any buffered log data.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="P:log4net.Appender.TraceAppender.ImmediateFlush">
+            <summary>
+            Gets or sets a value that indicates whether the appender will 
+            flush at the end of each write.
+            </summary>
+            <remarks>
+            <para>The default behavior is to flush at the end of each 
+            write. If the option is set to<c>false</c>, then the underlying 
+            stream can defer writing to physical medium to a later time. 
+            </para>
+            <para>
+            Avoiding the flush operation at the end of each append results 
+            in a performance gain of 10 to 20 percent. However, there is safety
+            trade-off involved in skipping flushing. Indeed, when flushing is
+            skipped, then it is likely that the last few log events will not
+            be recorded on disk when the application exits. This is a high
+            price to pay even for a 20% performance gain.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TraceAppender.Category">
+            <summary>
+            The category parameter sent to the Trace method.
+            </summary>
+            <remarks>
+            <para>
+            Defaults to %logger which will use the logger name of the current 
+            <see cref="T:log4net.Core.LoggingEvent"/> as the category parameter.
+            </para>
+            <para>
+            </para> 
+            </remarks>
+        </member>
+        <member name="P:log4net.Appender.TraceAppender.RequiresLayout">
+            <summary>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            This appender requires a <see cref="N:log4net.Layout"/> to be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.AliasDomainAttribute">
+            <summary>
+            Assembly level attribute that specifies a domain to alias to this assembly's repository.
+            </summary>
+            <remarks>
+            <para>
+            <b>AliasDomainAttribute is obsolete. Use AliasRepositoryAttribute instead of AliasDomainAttribute.</b>
+            </para>
+            <para>
+            An assembly's logger repository is defined by its <see cref="T:log4net.Config.DomainAttribute"/>,
+            however this can be overridden by an assembly loaded before the target assembly.
+            </para>
+            <para>
+            An assembly can alias another assembly's domain to its repository by
+            specifying this attribute with the name of the target domain.
+            </para>
+            <para>
+            This attribute can only be specified on the assembly and may be used
+            as many times as necessary to alias all the required domains.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Config.AliasRepositoryAttribute">
+            <summary>
+            Assembly level attribute that specifies a repository to alias to this assembly's repository.
+            </summary>
+            <remarks>
+            <para>
+            An assembly's logger repository is defined by its <see cref="T:log4net.Config.RepositoryAttribute"/>,
+            however this can be overridden by an assembly loaded before the target assembly.
+            </para>
+            <para>
+            An assembly can alias another assembly's repository to its repository by
+            specifying this attribute with the name of the target repository.
+            </para>
+            <para>
+            This attribute can only be specified on the assembly and may be used
+            as many times as necessary to alias all the required repositories.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.AliasRepositoryAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.AliasRepositoryAttribute"/> class with 
+            the specified repository to alias to this assembly's repository.
+            </summary>
+            <param name="name">The repository to alias to this assemby's repository.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Config.AliasRepositoryAttribute"/> class with 
+            the specified repository to alias to this assembly's repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.AliasRepositoryAttribute.Name">
+            <summary>
+            Gets or sets the repository to alias to this assemby's repository.
+            </summary>
+            <value>
+            The repository to alias to this assemby's repository.
+            </value>
+            <remarks>
+            <para>
+            The name of the repository to alias to this assemby's repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.AliasDomainAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.AliasDomainAttribute"/> class with 
+            the specified domain to alias to this assembly's repository.
+            </summary>
+            <param name="name">The domain to alias to this assemby's repository.</param>
+            <remarks>
+            <para>
+            Obsolete. Use <see cref="T:log4net.Config.AliasRepositoryAttribute"/> instead of <see cref="T:log4net.Config.AliasDomainAttribute"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.BasicConfigurator">
+            <summary>
+            Use this class to quickly configure a <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
+            </summary>
+            <remarks>
+            <para>
+            Allows very simple programmatic configuration of log4net.
+            </para>
+            <para>
+            Only one appender can be configured using this configurator.
+            The appender is set at the root of the hierarchy and all logging
+            events will be delivered to that appender.
+            </para>
+            <para>
+            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
+            they would require that the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions()"/> method
+            be called after the appenders properties have been configured.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Config.BasicConfigurator.declaringType">
+            <summary>
+            The fully qualified type of the BasicConfigurator class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.BasicConfigurator"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to prevent instantiation of this class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure">
+            <summary>
+            Initializes the log4net system with a default configuration.
+            </summary>
+            <remarks>
+            <para>
+            Initializes the log4net logging system using a <see cref="T:log4net.Appender.ConsoleAppender"/>
+            that will write to <c>Console.Out</c>. The log messages are
+            formatted using the <see cref="T:log4net.Layout.PatternLayout"/> layout object
+            with the <see cref="F:log4net.Layout.PatternLayout.DetailConversionPattern"/>
+            layout style.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Appender.IAppender[])">
+            <summary>
+            Initializes the log4net system using the specified appenders.
+            </summary>
+            <param name="appenders">The appenders to use to log all logging events.</param>
+            <remarks>
+            <para>
+            Initializes the log4net system using the specified appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Appender.IAppender)">
+            <summary>
+            Initializes the log4net system using the specified appender.
+            </summary>
+            <param name="appender">The appender to use to log all logging events.</param>
+            <remarks>
+            <para>
+            Initializes the log4net system using the specified appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> with a default configuration.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <remarks>
+            <para>
+            Initializes the specified repository using a <see cref="T:log4net.Appender.ConsoleAppender"/>
+            that will write to <c>Console.Out</c>. The log messages are
+            formatted using the <see cref="T:log4net.Layout.PatternLayout"/> layout object
+            with the <see cref="F:log4net.Layout.PatternLayout.DetailConversionPattern"/>
+            layout style.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Repository.ILoggerRepository,log4net.Appender.IAppender)">
+            <summary>
+            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appender.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="appender">The appender to use to log all logging events.</param>
+            <remarks>
+            <para>
+            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Repository.ILoggerRepository,log4net.Appender.IAppender[])">
+            <summary>
+            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appenders.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="appenders">The appenders to use to log all logging events.</param>
+            <remarks>
+            <para>
+            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.ConfiguratorAttribute">
+            <summary>
+            Base class for all log4net configuration attributes.
+            </summary>
+            <remarks>
+            This is an abstract class that must be extended by 
+            specific configurators. This attribute allows the
+            configurator to be parameterized by an assembly level
+            attribute.
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.ConfiguratorAttribute.#ctor(System.Int32)">
+            <summary>
+            Constructor used by subclasses.
+            </summary>
+            <param name="priority">the ordering priority for this configurator</param>
+            <remarks>
+            <para>
+            The <paramref name="priority"/> is used to order the configurator
+            attributes before they are invoked. Higher priority configurators are executed
+            before lower priority ones.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.ConfiguratorAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
+            </summary>
+            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
+            <param name="targetRepository">The repository to configure.</param>
+            <remarks>
+            <para>
+            Abstract method implemented by a subclass. When this method is called
+            the subclass should configure the <paramref name="targetRepository"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.ConfiguratorAttribute.CompareTo(System.Object)">
+            <summary>
+            Compare this instance to another ConfiguratorAttribute
+            </summary>
+            <param name="obj">the object to compare to</param>
+            <returns>see <see cref="M:System.IComparable.CompareTo(System.Object)"/></returns>
+            <remarks>
+            <para>
+            Compares the priorities of the two <see cref="T:log4net.Config.ConfiguratorAttribute"/> instances.
+            Sorts by priority in descending order. Objects with the same priority are
+            randomly ordered.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.DomainAttribute">
+            <summary>
+            Assembly level attribute that specifies the logging domain for the assembly.
+            </summary>
+            <remarks>
+            <para>
+            <b>DomainAttribute is obsolete. Use RepositoryAttribute instead of DomainAttribute.</b>
+            </para>
+            <para>
+            Assemblies are mapped to logging domains. Each domain has its own
+            logging repository. This attribute specified on the assembly controls
+            the configuration of the domain. The <see cref="P:log4net.Config.RepositoryAttribute.Name"/> property specifies the name
+            of the domain that this assembly is a part of. The <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/>
+            specifies the type of the repository objects to create for the domain. If 
+            this attribute is not specified and a <see cref="P:log4net.Config.RepositoryAttribute.Name"/> is not specified
+            then the assembly will be part of the default shared logging domain.
+            </para>
+            <para>
+            This attribute can only be specified on the assembly and may only be used
+            once per assembly.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Config.RepositoryAttribute">
+            <summary>
+            Assembly level attribute that specifies the logging repository for the assembly.
+            </summary>
+            <remarks>
+            <para>
+            Assemblies are mapped to logging repository. This attribute specified 
+            on the assembly controls
+            the configuration of the repository. The <see cref="P:log4net.Config.RepositoryAttribute.Name"/> property specifies the name
+            of the repository that this assembly is a part of. The <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/>
+            specifies the type of the <see cref="T:log4net.Repository.ILoggerRepository"/> object 
+            to create for the assembly. If this attribute is not specified or a <see cref="P:log4net.Config.RepositoryAttribute.Name"/> 
+            is not specified then the assembly will be part of the default shared logging repository.
+            </para>
+            <para>
+            This attribute can only be specified on the assembly and may only be used
+            once per assembly.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.RepositoryAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.RepositoryAttribute"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.RepositoryAttribute.#ctor(System.String)">
+            <summary>
+            Initialize a new instance of the <see cref="T:log4net.Config.RepositoryAttribute"/> class 
+            with the name of the repository.
+            </summary>
+            <param name="name">The name of the repository.</param>
+            <remarks>
+            <para>
+            Initialize the attribute with the name for the assembly's repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.RepositoryAttribute.Name">
+            <summary>
+            Gets or sets the name of the logging repository.
+            </summary>
+            <value>
+            The string name to use as the name of the repository associated with this
+            assembly.
+            </value>
+            <remarks>
+            <para>
+            This value does not have to be unique. Several assemblies can share the
+            same repository. They will share the logging configuration of the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.RepositoryAttribute.RepositoryType">
+            <summary>
+            Gets or sets the type of repository to create for this assembly.
+            </summary>
+            <value>
+            The type of repository to create for this assembly.
+            </value>
+            <remarks>
+            <para>
+            The type of the repository to create for the assembly.
+            The type must implement the <see cref="T:log4net.Repository.ILoggerRepository"/>
+            interface.
+            </para>
+            <para>
+            This will be the type of repository created when 
+            the repository is created. If multiple assemblies reference the
+            same repository then the repository is only created once using the
+            <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/> of the first assembly to call into the 
+            repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DomainAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.DomainAttribute"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Obsolete. Use RepositoryAttribute instead of DomainAttribute.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DomainAttribute.#ctor(System.String)">
+            <summary>
+            Initialize a new instance of the <see cref="T:log4net.Config.DomainAttribute"/> class 
+            with the name of the domain.
+            </summary>
+            <param name="name">The name of the domain.</param>
+            <remarks>
+            <para>
+            Obsolete. Use RepositoryAttribute instead of DomainAttribute.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.DOMConfigurator">
+            <summary>
+            Use this class to initialize the log4net environment using an Xml tree.
+            </summary>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            Configures a <see cref="T:log4net.Repository.ILoggerRepository"/> using an Xml tree.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.#ctor">
+            <summary>
+            Private constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure">
+            <summary>
+            Automatically configures the log4net system based on the 
+            application's configuration settings.
+            </summary>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            Each application has a configuration file. This has the
+            same name as the application with '.config' appended.
+            This file is XML and calling this function prompts the
+            configurator to look in that file for a section called
+            <c>log4net</c> that contains the configuration data.
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Automatically configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using settings
+            stored in the application's configuration file.
+            </summary>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            Each application has a configuration file. This has the
+            same name as the application with '.config' appended.
+            This file is XML and calling this function prompts the
+            configurator to look in that file for a section called
+            <c>log4net</c> that contains the configuration data.
+            </remarks>
+            <param name="repository">The repository to configure.</param>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(System.Xml.XmlElement)">
+            <summary>
+            Configures log4net using a <c>log4net</c> element
+            </summary>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            Loads the log4net configuration from the XML element
+            supplied as <paramref name="element"/>.
+            </remarks>
+            <param name="element">The element to parse.</param>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified XML 
+            element.
+            </summary>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            Loads the log4net configuration from the XML element
+            supplied as <paramref name="element"/>.
+            </remarks>
+            <param name="repository">The repository to configure.</param>
+            <param name="element">The element to parse.</param>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)">
+            <summary>
+            Configures log4net using the specified configuration file.
+            </summary>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the log4net configuration data.
+            </para>
+            <para>
+            The log4net configuration file can possible be specified in the application's
+            configuration file (either <c>MyAppName.exe.config</c> for a
+            normal application on <c>Web.config</c> for an ASP.NET application).
+            </para>
+            <example>
+            The following example configures log4net using a configuration file, of which the 
+            location is stored in the application's configuration file :
+            </example>
+            <code lang="C#">
+            using log4net.Config;
+            using System.IO;
+            using System.Configuration;
+            
+            ...
+            
+            DOMConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
+            </code>
+            <para>
+            In the <c>.config</c> file, the path to the log4net can be specified like this :
+            </para>
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net-config-file" value="log.config"/>
+            	</appSettings>
+            </configuration>
+            </code>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(System.IO.Stream)">
+            <summary>
+            Configures log4net using the specified configuration file.
+            </summary>
+            <param name="configStream">A stream to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the log4net configuration data.
+            </para>
+            <para>
+            Note that this method will NOT close the stream parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
+            file.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The log4net configuration file can possible be specified in the application's
+            configuration file (either <c>MyAppName.exe.config</c> for a
+            normal application on <c>Web.config</c> for an ASP.NET application).
+            </para>
+            <example>
+            The following example configures log4net using a configuration file, of which the 
+            location is stored in the application's configuration file :
+            </example>
+            <code lang="C#">
+            using log4net.Config;
+            using System.IO;
+            using System.Configuration;
+            
+            ...
+            
+            DOMConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
+            </code>
+            <para>
+            In the <c>.config</c> file, the path to the log4net can be specified like this :
+            </para>
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net-config-file" value="log.config"/>
+            	</appSettings>
+            </configuration>
+            </code>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.Stream)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
+            file.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configStream">The stream to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            Note that this method will NOT close the stream parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.ConfigureAndWatch(System.IO.FileInfo)">
+            <summary>
+            Configures log4net using the file specified, monitors the file for changes 
+            and reloads the configuration if a change is detected.
+            </summary>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
+            and depends on the behavior of that class.
+            </para>
+            <para>
+            For more information on how to configure log4net using
+            a separate configuration file, see <see cref="M:Configure(FileInfo)"/>.
+            </para>
+            </remarks>
+            <seealso cref="M:Configure(FileInfo)"/>
+        </member>
+        <member name="M:log4net.Config.DOMConfigurator.ConfigureAndWatch(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the file specified, 
+            monitors the file for changes and reloads the configuration if a change 
+            is detected.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
+            </para>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
+            and depends on the behavior of that class.
+            </para>
+            <para>
+            For more information on how to configure log4net using
+            a separate configuration file, see <see cref="M:Configure(FileInfo)"/>.
+            </para>
+            </remarks>
+            <seealso cref="M:Configure(FileInfo)"/>
+        </member>
+        <member name="T:log4net.Config.DOMConfiguratorAttribute">
+            <summary>
+            Assembly level attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>.
+            </summary>
+            <remarks>
+            <para>
+            <b>AliasDomainAttribute is obsolete. Use AliasRepositoryAttribute instead of AliasDomainAttribute.</b>
+            </para>
+            <para>
+            This attribute may only be used at the assembly scope and can only
+            be used once per assembly.
+            </para>
+            <para>
+            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
+            without calling one of the <see cref="M:XmlConfigurator.Configure()"/>
+            methods.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Config.XmlConfiguratorAttribute">
+            <summary>
+            Assembly level attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>.
+            </summary>
+            <remarks>
+            <para>
+            This attribute may only be used at the assembly scope and can only
+            be used once per assembly.
+            </para>
+            <para>
+            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
+            without calling one of the <see cref="M:XmlConfigurator.Configure()"/>
+            methods.
+            </para>
+            <para>
+            If neither of the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> or <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>
+            properties are set the configuration is loaded from the application's .config file.
+            If set the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property takes priority over the
+            <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property. The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property
+            specifies a path to a file to load the config from. The path is relative to the
+            application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
+            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property is used as a postfix to the assembly file name.
+            The config file must be located in the  application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
+            For example in a console application setting the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> to
+            <c>config</c> has the same effect as not specifying the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> or 
+            <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> properties.
+            </para>
+            <para>
+            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.Watch"/> property can be set to cause the <see cref="T:log4net.Config.XmlConfigurator"/>
+            to watch the configuration file for changes.
+            </para>
+            <note>
+            <para>
+            Log4net will only look for assembly level configuration attributes once.
+            When using the log4net assembly level attributes to control the configuration 
+            of log4net you must ensure that the first call to any of the 
+            <see cref="T:log4net.Core.LoggerManager"/> methods is made from the assembly with the configuration
+            attributes. 
+            </para>
+            <para>
+            If you cannot guarantee the order in which log4net calls will be made from 
+            different assemblies you must use programmatic configuration instead, i.e.
+            call the <see cref="M:XmlConfigurator.Configure()"/> method directly.
+            </para>
+            </note>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.XmlConfiguratorAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfiguratorAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
+            </summary>
+            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
+            <param name="targetRepository">The repository to configure.</param>
+            <remarks>
+            <para>
+            Configure the repository using the <see cref="T:log4net.Config.XmlConfigurator"/>.
+            The <paramref name="targetRepository"/> specified must extend the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>
+            class otherwise the <see cref="T:log4net.Config.XmlConfigurator"/> will not be able to
+            configure it.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="targetRepository"/> does not extend <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.</exception>
+        </member>
+        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromFile(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Attempt to load configuration from the local file system
+            </summary>
+            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
+            <param name="targetRepository">The repository to configure.</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromFile(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Configure the specified repository using a <see cref="T:System.IO.FileInfo"/>
+            </summary>
+            <param name="targetRepository">The repository to configure.</param>
+            <param name="configFile">the FileInfo pointing to the config file</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromUri(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Attempt to load configuration from a URI
+            </summary>
+            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
+            <param name="targetRepository">The repository to configure.</param>
+        </member>
+        <member name="F:log4net.Config.XmlConfiguratorAttribute.declaringType">
+            <summary>
+            The fully qualified type of the XmlConfiguratorAttribute class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile">
+            <summary>
+            Gets or sets the filename of the configuration file.
+            </summary>
+            <value>
+            The filename of the configuration file.
+            </value>
+            <remarks>
+            <para>
+            If specified, this is the name of the configuration file to use with
+            the <see cref="T:log4net.Config.XmlConfigurator"/>. This file path is relative to the
+            <b>application base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>).
+            </para>
+            <para>
+            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> takes priority over the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension">
+            <summary>
+            Gets or sets the extension of the configuration file.
+            </summary>
+            <value>
+            The extension of the configuration file.
+            </value>
+            <remarks>
+            <para>
+            If specified this is the extension for the configuration file.
+            The path to the config file is built by using the <b>application 
+            base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>),
+            the <b>assembly file name</b> and the config file extension.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> is set to <c>MyExt</c> then
+            possible config file names would be: <c>MyConsoleApp.exe.MyExt</c> or
+            <c>MyClassLibrary.dll.MyExt</c>.
+            </para>
+            <para>
+            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> takes priority over the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.XmlConfiguratorAttribute.Watch">
+            <summary>
+            Gets or sets a value indicating whether to watch the configuration file.
+            </summary>
+            <value>
+            <c>true</c> if the configuration should be watched, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            If this flag is specified and set to <c>true</c> then the framework
+            will watch the configuration file and will reload the config each time 
+            the file is modified.
+            </para>
+            <para>
+            The config file can only be watched if it is loaded from local disk.
+            In a No-Touch (Smart Client) deployment where the application is downloaded
+            from a web server the config file may not reside on the local disk
+            and therefore it may not be able to watch it.
+            </para>
+            <note>
+            Watching configuration is not supported on the SSCLI.
+            </note>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.Log4NetConfigurationSectionHandler">
+            <summary>
+            Class to register for the log4net section of the configuration file
+            </summary>
+            <remarks>
+            The log4net section of the configuration file needs to have a section
+            handler registered. This is the section handler used. It simply returns
+            the XML element that is the root of the section.
+            </remarks>
+            <example>
+            Example of registering the log4net section handler :
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<configSections>
+            		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+            	</configSections>
+            	<log4net>
+            		log4net configuration XML goes here
+            	</log4net>
+            </configuration>
+            </code>
+            </example>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.Log4NetConfigurationSectionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> class.
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.Log4NetConfigurationSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Parses the configuration section.
+            </summary>
+            <param name="parent">The configuration settings in a corresponding parent configuration section.</param>
+            <param name="configContext">The configuration context when called from the ASP.NET configuration system. Otherwise, this parameter is reserved and is a null reference.</param>
+            <param name="section">The <see cref="T:System.Xml.XmlNode"/> for the log4net section.</param>
+            <returns>The <see cref="T:System.Xml.XmlNode"/> for the log4net section.</returns>
+            <remarks>
+            <para>
+            Returns the <see cref="T:System.Xml.XmlNode"/> containing the configuration data,
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.PluginAttribute">
+            <summary>
+            Assembly level attribute that specifies a plugin to attach to 
+            the repository.
+            </summary>
+            <remarks>
+            <para>
+            Specifies the type of a plugin to create and attach to the
+            assembly's repository. The plugin type must implement the
+            <see cref="T:log4net.Plugin.IPlugin"/> interface.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Plugin.IPluginFactory">
+            <summary>
+            Interface used to create plugins.
+            </summary>
+            <remarks>
+            <para>
+            Interface used to create  a plugin.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Plugin.IPluginFactory.CreatePlugin">
+            <summary>
+            Creates the plugin object.
+            </summary>
+            <returns>the new plugin instance</returns>
+            <remarks>
+            <para>
+            Create and return a new plugin instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.PluginAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.PluginAttribute"/> class
+            with the specified type.
+            </summary>
+            <param name="typeName">The type name of plugin to create.</param>
+            <remarks>
+            <para>
+            Create the attribute with the plugin type specified.
+            </para>
+            <para>
+            Where possible use the constructor that takes a <see cref="T:System.Type"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.PluginAttribute.#ctor(System.Type)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.PluginAttribute"/> class
+            with the specified type.
+            </summary>
+            <param name="type">The type of plugin to create.</param>
+            <remarks>
+            <para>
+            Create the attribute with the plugin type specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.PluginAttribute.CreatePlugin">
+            <summary>
+            Creates the plugin object defined by this attribute.
+            </summary>
+            <remarks>
+            <para>
+            Creates the instance of the <see cref="T:log4net.Plugin.IPlugin"/> object as 
+            specified by this attribute.
+            </para>
+            </remarks>
+            <returns>The plugin object.</returns>
+        </member>
+        <member name="M:log4net.Config.PluginAttribute.ToString">
+            <summary>
+            Returns a representation of the properties of this object.
+            </summary>
+            <remarks>
+            <para>
+            Overrides base class <see cref="M:Object.ToString()" /> method to 
+            return a representation of the properties of this object.
+            </para>
+            </remarks>
+            <returns>A representation of the properties of this object</returns>
+        </member>
+        <member name="P:log4net.Config.PluginAttribute.Type">
+            <summary>
+            Gets or sets the type for the plugin.
+            </summary>
+            <value>
+            The type for the plugin.
+            </value>
+            <remarks>
+            <para>
+            The type for the plugin.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.PluginAttribute.TypeName">
+            <summary>
+            Gets or sets the type name for the plugin.
+            </summary>
+            <value>
+            The type name for the plugin.
+            </value>
+            <remarks>
+            <para>
+            The type name for the plugin.
+            </para>
+            <para>
+            Where possible use the <see cref="P:log4net.Config.PluginAttribute.Type"/> property instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.SecurityContextProviderAttribute">
+            <summary>
+            Assembly level attribute to configure the <see cref="T:log4net.Core.SecurityContextProvider"/>.
+            </summary>
+            <remarks>
+            <para>
+            This attribute may only be used at the assembly scope and can only
+            be used once per assembly.
+            </para>
+            <para>
+            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
+            without calling one of the <see cref="M:XmlConfigurator.Configure()"/>
+            methods.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Config.SecurityContextProviderAttribute.#ctor(System.Type)">
+            <summary>
+            Construct provider attribute with type specified
+            </summary>
+            <param name="providerType">the type of the provider to use</param>
+            <remarks>
+            <para>
+            The provider specified must subclass the <see cref="T:log4net.Core.SecurityContextProvider"/>
+            class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.SecurityContextProviderAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Configures the SecurityContextProvider
+            </summary>
+            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
+            <param name="targetRepository">The repository to configure.</param>
+            <remarks>
+            <para>
+            Creates a provider instance from the <see cref="P:log4net.Config.SecurityContextProviderAttribute.ProviderType"/> specified.
+            Sets this as the default security context provider <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Config.SecurityContextProviderAttribute.declaringType">
+            <summary>
+            The fully qualified type of the SecurityContextProviderAttribute class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Config.SecurityContextProviderAttribute.ProviderType">
+            <summary>
+            Gets or sets the type of the provider to use.
+            </summary>
+            <value>
+            the type of the provider to use.
+            </value>
+            <remarks>
+            <para>
+            The provider specified must subclass the <see cref="T:log4net.Core.SecurityContextProvider"/>
+            class.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.XmlConfigurator">
+            <summary>
+            Use this class to initialize the log4net environment using an Xml tree.
+            </summary>
+            <remarks>
+            <para>
+            Configures a <see cref="T:log4net.Repository.ILoggerRepository"/> using an Xml tree.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.#ctor">
+            <summary>
+            Private constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Automatically configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using settings
+            stored in the application's configuration file.
+            </summary>
+            <remarks>
+            <para>
+            Each application has a configuration file. This has the
+            same name as the application with '.config' appended.
+            This file is XML and calling this function prompts the
+            configurator to look in that file for a section called
+            <c>log4net</c> that contains the configuration data.
+            </para>
+            <para>
+            To use this method to configure log4net you must specify 
+            the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> section
+            handler for the <c>log4net</c> configuration section. See the
+            <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> for an example.
+            </para>
+            </remarks>
+            <param name="repository">The repository to configure.</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure">
+            <summary>
+            Automatically configures the log4net system based on the 
+            application's configuration settings.
+            </summary>
+            <remarks>
+            <para>
+            Each application has a configuration file. This has the
+            same name as the application with '.config' appended.
+            This file is XML and calling this function prompts the
+            configurator to look in that file for a section called
+            <c>log4net</c> that contains the configuration data.
+            </para>
+            <para>
+            To use this method to configure log4net you must specify 
+            the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> section
+            handler for the <c>log4net</c> configuration section. See the
+            <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> for an example.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(System.Xml.XmlElement)">
+            <summary>
+            Configures log4net using a <c>log4net</c> element
+            </summary>
+            <remarks>
+            <para>
+            Loads the log4net configuration from the XML element
+            supplied as <paramref name="element"/>.
+            </para>
+            </remarks>
+            <param name="element">The element to parse.</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)">
+            <summary>
+            Configures log4net using the specified configuration file.
+            </summary>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the log4net configuration data.
+            </para>
+            <para>
+            The log4net configuration file can possible be specified in the application's
+            configuration file (either <c>MyAppName.exe.config</c> for a
+            normal application on <c>Web.config</c> for an ASP.NET application).
+            </para>
+            <para>
+            The first element matching <c>&lt;configuration&gt;</c> will be read as the 
+            configuration. If this file is also a .NET .config file then you must specify 
+            a configuration section for the <c>log4net</c> element otherwise .NET will 
+            complain. Set the type for the section handler to <see cref="T:System.Configuration.IgnoreSectionHandler"/>, for example:
+            <code lang="XML" escaped="true">
+            <configSections>
+            	<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
+            </configSections>
+            </code>
+            </para>
+            <example>
+            The following example configures log4net using a configuration file, of which the 
+            location is stored in the application's configuration file :
+            </example>
+            <code lang="C#">
+            using log4net.Config;
+            using System.IO;
+            using System.Configuration;
+            
+            ...
+            
+            XmlConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
+            </code>
+            <para>
+            In the <c>.config</c> file, the path to the log4net can be specified like this :
+            </para>
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net-config-file" value="log.config"/>
+            	</appSettings>
+            </configuration>
+            </code>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(System.Uri)">
+            <summary>
+            Configures log4net using the specified configuration URI.
+            </summary>
+            <param name="configUri">A URI to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the log4net configuration data.
+            </para>
+            <para>
+            The <see cref="T:System.Net.WebRequest"/> must support the URI scheme specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(System.IO.Stream)">
+            <summary>
+            Configures log4net using the specified configuration data stream.
+            </summary>
+            <param name="configStream">A stream to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the log4net configuration data.
+            </para>
+            <para>
+            Note that this method will NOT close the stream parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified XML 
+            element.
+            </summary>
+            <remarks>
+            Loads the log4net configuration from the XML element
+            supplied as <paramref name="element"/>.
+            </remarks>
+            <param name="repository">The repository to configure.</param>
+            <param name="element">The element to parse.</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
+            file.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The log4net configuration file can possible be specified in the application's
+            configuration file (either <c>MyAppName.exe.config</c> for a
+            normal application on <c>Web.config</c> for an ASP.NET application).
+            </para>
+            <para>
+            The first element matching <c>&lt;configuration&gt;</c> will be read as the 
+            configuration. If this file is also a .NET .config file then you must specify 
+            a configuration section for the <c>log4net</c> element otherwise .NET will 
+            complain. Set the type for the section handler to <see cref="T:System.Configuration.IgnoreSectionHandler"/>, for example:
+            <code lang="XML" escaped="true">
+            <configSections>
+            	<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
+            </configSections>
+            </code>
+            </para>
+            <example>
+            The following example configures log4net using a configuration file, of which the 
+            location is stored in the application's configuration file :
+            </example>
+            <code lang="C#">
+            using log4net.Config;
+            using System.IO;
+            using System.Configuration;
+            
+            ...
+            
+            XmlConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
+            </code>
+            <para>
+            In the <c>.config</c> file, the path to the log4net can be specified like this :
+            </para>
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net-config-file" value="log.config"/>
+            	</appSettings>
+            </configuration>
+            </code>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Uri)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
+            URI.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configUri">A URI to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The <see cref="T:System.Net.WebRequest"/> must support the URI scheme specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.Stream)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
+            file.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configStream">The stream to load the XML configuration from.</param>
+            <remarks>
+            <para>
+            The configuration data must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            Note that this method will NOT close the stream parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatch(System.IO.FileInfo)">
+            <summary>
+            Configures log4net using the file specified, monitors the file for changes 
+            and reloads the configuration if a change is detected.
+            </summary>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
+            and depends on the behavior of that class.
+            </para>
+            <para>
+            For more information on how to configure log4net using
+            a separate configuration file, see <see cref="M:Configure(FileInfo)"/>.
+            </para>
+            </remarks>
+            <seealso cref="M:Configure(FileInfo)"/>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatch(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the file specified, 
+            monitors the file for changes and reloads the configuration if a change 
+            is detected.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configFile">The XML file to load the configuration from.</param>
+            <remarks>
+            <para>
+            The configuration file must be valid XML. It must contain
+            at least one element called <c>log4net</c> that holds
+            the configuration data.
+            </para>
+            <para>
+            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
+            and depends on the behavior of that class.
+            </para>
+            <para>
+            For more information on how to configure log4net using
+            a separate configuration file, see <see cref="M:Configure(FileInfo)"/>.
+            </para>
+            </remarks>
+            <seealso cref="M:Configure(FileInfo)"/>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.InternalConfigureFromXml(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
+            <summary>
+            Configures the specified repository using a <c>log4net</c> element.
+            </summary>
+            <param name="repository">The hierarchy to configure.</param>
+            <param name="element">The element to parse.</param>
+            <remarks>
+            <para>
+            Loads the log4net configuration from the XML element
+            supplied as <paramref name="element"/>.
+            </para>
+            <para>
+            This method is ultimately called by one of the Configure methods 
+            to load the configuration from an <see cref="T:System.Xml.XmlElement"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.m_repositoryName2ConfigAndWatchHandler">
+            <summary>
+            Maps repository names to ConfigAndWatchHandler instances to allow a particular
+            ConfigAndWatchHandler to dispose of its FileSystemWatcher when a repository is 
+            reconfigured.
+            </summary>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.declaringType">
+            <summary>
+            The fully qualified type of the XmlConfigurator class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler">
+            <summary>
+            Class used to watch config files.
+            </summary>
+            <remarks>
+            <para>
+            Uses the <see cref="T:System.IO.FileSystemWatcher"/> to monitor
+            changes to a specified file. Because multiple change notifications
+            may be raised when the file is modified, a timer is used to
+            compress the notifications into a single event. The timer
+            waits for <see cref="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis"/> time before delivering
+            the event notification. If any further <see cref="T:System.IO.FileSystemWatcher"/>
+            change notifications arrive while the timer is waiting it
+            is reset and waits again for <see cref="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis"/> to
+            elapse.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis">
+            <summary>
+            The default amount of time to wait after receiving notification
+            before reloading the config file.
+            </summary>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_configFile">
+            <summary>
+            Holds the FileInfo used to configure the XmlConfigurator
+            </summary>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_repository">
+            <summary>
+            Holds the repository being configured.
+            </summary>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_timer">
+            <summary>
+            The timer used to compress the notification events.
+            </summary>
+        </member>
+        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_watcher">
+            <summary>
+            Watches file for changes. This object should be disposed when no longer
+            needed to free system handles on the watched resources.
+            </summary>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.#ctor(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/> class to
+            watch a specified config file used to configure a repository.
+            </summary>
+            <param name="repository">The repository to configure.</param>
+            <param name="configFile">The configuration file to watch.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.ConfigureAndWatchHandler_OnChanged(System.Object,System.IO.FileSystemEventArgs)">
+            <summary>
+            Event handler used by <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/>.
+            </summary>
+            <param name="source">The <see cref="T:System.IO.FileSystemWatcher"/> firing the event.</param>
+            <param name="e">The argument indicates the file that caused the event to be fired.</param>
+            <remarks>
+            <para>
+            This handler reloads the configuration from the file when the event is fired.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.ConfigureAndWatchHandler_OnRenamed(System.Object,System.IO.RenamedEventArgs)">
+            <summary>
+            Event handler used by <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/>.
+            </summary>
+            <param name="source">The <see cref="T:System.IO.FileSystemWatcher"/> firing the event.</param>
+            <param name="e">The argument indicates the file that caused the event to be fired.</param>
+            <remarks>
+            <para>
+            This handler reloads the configuration from the file when the event is fired.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.OnWatchedFileChange(System.Object)">
+            <summary>
+            Called by the timer when the configuration has been updated.
+            </summary>
+            <param name="state">null</param>
+        </member>
+        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.Dispose">
+            <summary>
+            Release the handles held by the watcher and timer.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.CompactRepositorySelector">
+            <summary>
+            The implementation of the <see cref="T:log4net.Core.IRepositorySelector"/> interface suitable
+            for use with the compact framework
+            </summary>
+            <remarks>
+            <para>
+            This <see cref="T:log4net.Core.IRepositorySelector"/> implementation is a simple
+            mapping between repository name and <see cref="T:log4net.Repository.ILoggerRepository"/>
+            object.
+            </para>
+            <para>
+            The .NET Compact Framework 1.0 does not support retrieving assembly
+            level attributes therefore unlike the <c>DefaultRepositorySelector</c>
+            this selector does not examine the calling assembly for attributes.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Core.IRepositorySelector">
+            <summary>
+            Interface used by the <see cref="T:log4net.LogManager"/> to select the <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.LogManager"/> uses a <see cref="T:log4net.Core.IRepositorySelector"/> 
+            to specify the policy for selecting the correct <see cref="T:log4net.Repository.ILoggerRepository"/> 
+            to return to the caller.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.GetRepository(System.Reflection.Assembly)">
+            <summary>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
+            </summary>
+            <param name="assembly">The assembly to use to lookup to the <see cref="T:log4net.Repository.ILoggerRepository"/></param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the assembly.</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
+            </para>
+            <para>
+            How the association between <see cref="T:System.Reflection.Assembly"/> and <see cref="T:log4net.Repository.ILoggerRepository"/>
+            is made is not defined. The implementation may choose any method for
+            this association. The results of this method must be repeatable, i.e.
+            when called again with the same arguments the result must be the
+            save value.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.GetRepository(System.String)">
+            <summary>
+            Gets the named <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </summary>
+            <param name="repositoryName">The name to use to lookup to the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <returns>The named <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
+            <remarks>
+            Lookup a named <see cref="T:log4net.Repository.ILoggerRepository"/>. This is the repository created by
+            calling <see cref="M:CreateRepository(string,Type)"/>.
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Creates a new repository for the assembly specified.
+            </summary>
+            <param name="assembly">The assembly to use to create the domain to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <returns>The repository created.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the domain
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            <para>
+            How the association between <see cref="T:System.Reflection.Assembly"/> and <see cref="T:log4net.Repository.ILoggerRepository"/>
+            is made is not defined. The implementation may choose any method for
+            this association.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.CreateRepository(System.String,System.Type)">
+            <summary>
+            Creates a new repository with the name specified.
+            </summary>
+            <param name="repositoryName">The name to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <returns>The repository created.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the name
+            specified such that a call to <see cref="M:GetRepository(string)"/> with the
+            same name will return the same repository instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.ExistsRepository(System.String)">
+            <summary>
+            Test if a named repository exists
+            </summary>
+            <param name="repositoryName">the named repository to check</param>
+            <returns><c>true</c> if the repository exists</returns>
+            <remarks>
+            <para>
+            Test if a named repository exists. Use <see cref="M:CreateRepository(Assembly, Type)"/>
+            to create a new repository and <see cref="M:GetRepository(Assembly)"/> to retrieve 
+            a repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IRepositorySelector.GetAllRepositories">
+            <summary>
+            Gets an array of all currently defined repositories.
+            </summary>
+            <returns>
+            An array of the <see cref="T:log4net.Repository.ILoggerRepository"/> instances created by 
+            this <see cref="T:log4net.Core.IRepositorySelector"/>.</returns>
+            <remarks>
+            <para>
+            Gets an array of all of the repositories created by this selector.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent">
+            <summary>
+            Event to notify that a logger repository has been created.
+            </summary>
+            <value>
+            Event to notify that a logger repository has been created.
+            </value>
+            <remarks>
+            <para>
+            Event raised when a new repository is created.
+            The event source will be this selector. The event args will
+            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
+            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.#ctor(System.Type)">
+            <summary>
+            Create a new repository selector
+            </summary>
+            <param name="defaultRepositoryType">the type of the repositories to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
+            <remarks>
+            <para>
+            Create an new compact repository selector.
+            The default type for repositories must be specified,
+            an appropriate value would be <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">throw if <paramref name="defaultRepositoryType"/> is null</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">throw if <paramref name="defaultRepositoryType"/> does not implement <see cref="T:log4net.Repository.ILoggerRepository"/></exception>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.GetRepository(System.Reflection.Assembly)">
+            <summary>
+            Get the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly
+            </summary>
+            <param name="assembly">not used</param>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
+            <remarks>
+            <para>
+            The <paramref name="assembly"/> argument is not used. This selector does not create a
+            separate repository for each assembly. 
+            </para>
+            <para>
+            As a named repository is not specified the default repository is 
+            returned. The default repository is named <c>log4net-default-repository</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.GetRepository(System.String)">
+            <summary>
+            Get the named <see cref="T:log4net.Repository.ILoggerRepository"/>
+            </summary>
+            <param name="repositoryName">the name of the repository to lookup</param>
+            <returns>The named <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
+            <remarks>
+            <para>
+            Get the named <see cref="T:log4net.Repository.ILoggerRepository"/>. The default 
+            repository is <c>log4net-default-repository</c>. Other repositories 
+            must be created using the <see cref="M:CreateRepository(string, Type)"/>.
+            If the named repository does not exist an exception is thrown.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">throw if <paramref name="repositoryName"/> is null</exception>
+            <exception cref="T:log4net.Core.LogException">throw if the <paramref name="repositoryName"/> does not exist</exception>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Create a new repository for the assembly specified 
+            </summary>
+            <param name="assembly">not used</param>
+            <param name="repositoryType">the type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
+            <returns>the repository created</returns>
+            <remarks>
+            <para>
+            The <paramref name="assembly"/> argument is not used. This selector does not create a
+            separate repository for each assembly. 
+            </para>
+            <para>
+            If the <paramref name="repositoryType"/> is <c>null</c> then the
+            default repository type specified to the constructor is used.
+            </para>
+            <para>
+            As a named repository is not specified the default repository is 
+            returned. The default repository is named <c>log4net-default-repository</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.String,System.Type)">
+            <summary>
+            Create a new repository for the repository specified
+            </summary>
+            <param name="repositoryName">the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/></param>
+            <param name="repositoryType">the type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            If this param is null then the default repository type is used.</param>
+            <returns>the repository created</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(string)"/> with the
+            same repository specified will return the same repository instance.
+            </para>
+            <para>
+            If the named repository already exists an exception will be thrown.
+            </para>
+            <para>
+            If <paramref name="repositoryType"/> is <c>null</c> then the default 
+            repository type specified to the constructor is used.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">throw if <paramref name="repositoryName"/> is null</exception>
+            <exception cref="T:log4net.Core.LogException">throw if the <paramref name="repositoryName"/> already exists</exception>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.ExistsRepository(System.String)">
+            <summary>
+            Test if a named repository exists
+            </summary>
+            <param name="repositoryName">the named repository to check</param>
+            <returns><c>true</c> if the repository exists</returns>
+            <remarks>
+            <para>
+            Test if a named repository exists. Use <see cref="M:CreateRepository(string, Type)"/>
+            to create a new repository and <see cref="M:GetRepository(string)"/> to retrieve 
+            a repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.GetAllRepositories">
+            <summary>
+            Gets a list of <see cref="T:log4net.Repository.ILoggerRepository"/> objects
+            </summary>
+            <returns>an array of all known <see cref="T:log4net.Repository.ILoggerRepository"/> objects</returns>
+            <remarks>
+            <para>
+            Gets an array of all of the repositories created by this selector.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.CompactRepositorySelector.declaringType">
+            <summary>
+            The fully qualified type of the CompactRepositorySelector class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.CompactRepositorySelector.OnLoggerRepositoryCreatedEvent(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Notify the registered listeners that the repository has been created
+            </summary>
+            <param name="repository">The repository that has been created</param>
+            <remarks>
+            <para>
+            Raises the <event cref="E:log4net.Core.CompactRepositorySelector.LoggerRepositoryCreatedEvent">LoggerRepositoryCreatedEvent</event>
+            event.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Core.CompactRepositorySelector.LoggerRepositoryCreatedEvent">
+            <summary>
+            Event to notify that a logger repository has been created.
+            </summary>
+            <value>
+            Event to notify that a logger repository has been created.
+            </value>
+            <remarks>
+            <para>
+            Event raised when a new repository is created.
+            The event source will be this selector. The event args will
+            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
+            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.DefaultRepositorySelector">
+            <summary>
+            The default implementation of the <see cref="T:log4net.Core.IRepositorySelector"/> interface.
+            </summary>
+            <remarks>
+            <para>
+            Uses attributes defined on the calling assembly to determine how to
+            configure the hierarchy for the repository.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.#ctor(System.Type)">
+            <summary>
+            Creates a new repository selector.
+            </summary>
+            <param name="defaultRepositoryType">The type of the repositories to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
+            <remarks>
+            <para>
+            Create an new repository selector.
+            The default type for repositories must be specified,
+            an appropriate value would be <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException"><paramref name="defaultRepositoryType"/> is <see langword="null"/>.</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="defaultRepositoryType"/> does not implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.Reflection.Assembly)">
+            <summary>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
+            </summary>
+            <param name="repositoryAssembly">The assembly use to lookup the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <remarks>
+            <para>
+            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and the repository 
+            to create can be overridden by specifying the <see cref="T:log4net.Config.RepositoryAttribute"/> 
+            attribute on the <paramref name="repositoryAssembly"/>.
+            </para>
+            <para>
+            The default values are to use the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> 
+            implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
+            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically configured using 
+            any <see cref="T:log4net.Config.ConfiguratorAttribute"/> attributes defined on
+            the <paramref name="repositoryAssembly"/>.
+            </para>
+            </remarks>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the assembly</returns>
+            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.String)">
+            <summary>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified repository.
+            </summary>
+            <param name="repositoryName">The repository to use to lookup the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified repository.</returns>
+            <remarks>
+            <para>
+            Returns the named repository. If <paramref name="repositoryName"/> is <c>null</c>
+            a <see cref="T:System.ArgumentNullException"/> is thrown. If the repository 
+            does not exist a <see cref="T:log4net.Core.LogException"/> is thrown.
+            </para>
+            <para>
+            Use <see cref="M:CreateRepository(string, Type)"/> to create a repository.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryName"/> is <see langword="null"/>.</exception>
+            <exception cref="T:log4net.Core.LogException"><paramref name="repositoryName"/> does not exist.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Create a new repository for the assembly specified 
+            </summary>
+            <param name="repositoryAssembly">the assembly to use to create the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <returns>The repository created.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            <para>
+            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and
+            the repository to create can be overridden by specifying the
+            <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the 
+            <paramref name="repositoryAssembly"/>.  The default values are to use the 
+            <paramref name="repositoryType"/> implementation of the 
+            <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
+            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically
+            configured using any <see cref="T:log4net.Config.ConfiguratorAttribute"/> 
+            attributes defined on the <paramref name="repositoryAssembly"/>.
+            </para>
+            <para>
+            If a repository for the <paramref name="repositoryAssembly"/> already exists
+            that repository will be returned. An error will not be raised and that 
+            repository may be of a different type to that specified in <paramref name="repositoryType"/>.
+            Also the <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the
+            assembly may be used to override the repository type specified in 
+            <paramref name="repositoryType"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type,System.String,System.Boolean)">
+            <summary>
+            Creates a new repository for the assembly specified.
+            </summary>
+            <param name="repositoryAssembly">the assembly to use to create the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryName">The name to assign to the created repository</param>
+            <param name="readAssemblyAttributes">Set to <c>true</c> to read and apply the assembly attributes</param>
+            <returns>The repository created.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            <para>
+            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and
+            the repository to create can be overridden by specifying the
+            <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the 
+            <paramref name="repositoryAssembly"/>.  The default values are to use the 
+            <paramref name="repositoryType"/> implementation of the 
+            <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
+            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically
+            configured using any <see cref="T:log4net.Config.ConfiguratorAttribute"/> 
+            attributes defined on the <paramref name="repositoryAssembly"/>.
+            </para>
+            <para>
+            If a repository for the <paramref name="repositoryAssembly"/> already exists
+            that repository will be returned. An error will not be raised and that 
+            repository may be of a different type to that specified in <paramref name="repositoryType"/>.
+            Also the <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the
+            assembly may be used to override the repository type specified in 
+            <paramref name="repositoryType"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.String,System.Type)">
+            <summary>
+            Creates a new repository for the specified repository.
+            </summary>
+            <param name="repositoryName">The repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
+            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            If this param is <see langword="null"/> then the default repository type is used.</param>
+            <returns>The new repository.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(string)"/> with the
+            same repository specified will return the same repository instance.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryName"/> is <see langword="null"/>.</exception>
+            <exception cref="T:log4net.Core.LogException"><paramref name="repositoryName"/> already exists.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.ExistsRepository(System.String)">
+            <summary>
+            Test if a named repository exists
+            </summary>
+            <param name="repositoryName">the named repository to check</param>
+            <returns><c>true</c> if the repository exists</returns>
+            <remarks>
+            <para>
+            Test if a named repository exists. Use <see cref="M:CreateRepository(string, Type)"/>
+            to create a new repository and <see cref="M:GetRepository(string)"/> to retrieve 
+            a repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.GetAllRepositories">
+            <summary>
+            Gets a list of <see cref="T:log4net.Repository.ILoggerRepository"/> objects
+            </summary>
+            <returns>an array of all known <see cref="T:log4net.Repository.ILoggerRepository"/> objects</returns>
+            <remarks>
+            <para>
+            Gets an array of all of the repositories created by this selector.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.AliasRepository(System.String,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Aliases a repository to an existing repository.
+            </summary>
+            <param name="repositoryAlias">The repository to alias.</param>
+            <param name="repositoryTarget">The repository that the repository is aliased to.</param>
+            <remarks>
+            <para>
+            The repository specified will be aliased to the repository when created. 
+            The repository must not already exist.
+            </para>
+            <para>
+            When the repository is created it must utilize the same repository type as 
+            the repository it is aliased to, otherwise the aliasing will fail.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">
+            <para><paramref name="repositoryAlias"/> is <see langword="null"/>.</para>
+            <para>-or-</para>
+            <para><paramref name="repositoryTarget"/> is <see langword="null"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.OnLoggerRepositoryCreatedEvent(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Notifies the registered listeners that the repository has been created.
+            </summary>
+            <param name="repository">The repository that has been created.</param>
+            <remarks>
+            <para>
+            Raises the <see cref="E:log4net.Core.DefaultRepositorySelector.LoggerRepositoryCreatedEvent"/> event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.GetInfoForAssembly(System.Reflection.Assembly,System.String@,System.Type@)">
+            <summary>
+            Gets the repository name and repository type for the specified assembly.
+            </summary>
+            <param name="assembly">The assembly that has a <see cref="T:log4net.Config.RepositoryAttribute"/>.</param>
+            <param name="repositoryName">in/out param to hold the repository name to use for the assembly, caller should set this to the default value before calling.</param>
+            <param name="repositoryType">in/out param to hold the type of the repository to create for the assembly, caller should set this to the default value before calling.</param>
+            <exception cref="T:System.ArgumentNullException"><paramref name="assembly"/> is <see langword="null"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.ConfigureRepository(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Configures the repository using information from the assembly.
+            </summary>
+            <param name="assembly">The assembly containing <see cref="T:log4net.Config.ConfiguratorAttribute"/>
+            attributes which define the configuration for the repository.</param>
+            <param name="repository">The repository to configure.</param>
+            <exception cref="T:System.ArgumentNullException">
+            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
+            <para>-or-</para>
+            <para><paramref name="repository"/> is <see langword="null"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.LoadPlugins(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Loads the attribute defined plugins on the assembly.
+            </summary>
+            <param name="assembly">The assembly that contains the attributes.</param>
+            <param name="repository">The repository to add the plugins to.</param>
+            <exception cref="T:System.ArgumentNullException">
+            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
+            <para>-or-</para>
+            <para><paramref name="repository"/> is <see langword="null"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.DefaultRepositorySelector.LoadAliases(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
+            <summary>
+            Loads the attribute defined aliases on the assembly.
+            </summary>
+            <param name="assembly">The assembly that contains the attributes.</param>
+            <param name="repository">The repository to alias to.</param>
+            <exception cref="T:System.ArgumentNullException">
+            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
+            <para>-or-</para>
+            <para><paramref name="repository"/> is <see langword="null"/>.</para>
+            </exception>
+        </member>
+        <member name="F:log4net.Core.DefaultRepositorySelector.declaringType">
+            <summary>
+            The fully qualified type of the DefaultRepositorySelector class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="E:log4net.Core.DefaultRepositorySelector.LoggerRepositoryCreatedEvent">
+            <summary>
+            Event to notify that a logger repository has been created.
+            </summary>
+            <value>
+            Event to notify that a logger repository has been created.
+            </value>
+            <remarks>
+            <para>
+            Event raised when a new repository is created.
+            The event source will be this selector. The event args will
+            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
+            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.ErrorCode">
+            <summary>
+            Defined error codes that can be passed to the <see cref="M:IErrorHandler.Error(string, Exception, ErrorCode)"/> method.
+            </summary>
+            <remarks>
+            <para>
+            Values passed to the <see cref="M:IErrorHandler.Error(string, Exception, ErrorCode)"/> method.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.GenericFailure">
+            <summary>
+            A general error
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.WriteFailure">
+            <summary>
+            Error while writing output
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.FlushFailure">
+            <summary>
+            Failed to flush file
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.CloseFailure">
+            <summary>
+            Failed to close file
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.FileOpenFailure">
+            <summary>
+            Unable to open output file
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.MissingLayout">
+            <summary>
+            No layout specified
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ErrorCode.AddressParseFailure">
+            <summary>
+            Failed to parse address
+            </summary>
+        </member>
+        <member name="T:log4net.Core.ExceptionEvaluator">
+            <summary>
+            An evaluator that triggers on an Exception type
+            </summary>
+            <remarks>
+            <para>
+            This evaluator will trigger if the type of the Exception
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to a Type in <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/>.    /// 
+            </para>
+            </remarks>
+            <author>Drew Schaeffer</author>
+        </member>
+        <member name="T:log4net.Core.ITriggeringEventEvaluator">
+            <summary>
+            Test if an <see cref="T:log4net.Core.LoggingEvent"/> triggers an action
+            </summary>
+            <remarks>
+            <para>
+            Implementations of this interface allow certain appenders to decide
+            when to perform an appender specific action.
+            </para>
+            <para>
+            The action or behavior triggered is defined by the implementation.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Core.ITriggeringEventEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Test if this event triggers the action
+            </summary>
+            <param name="loggingEvent">The event to check</param>
+            <returns><c>true</c> if this event triggers the action, otherwise <c>false</c></returns>
+            <remarks>
+            <para>
+            Return <c>true</c> if this event triggers the action
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.ExceptionEvaluator.m_type">
+            <summary>
+            The type that causes the trigger to fire.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.ExceptionEvaluator.m_triggerOnSubclass">
+            <summary>
+            Causes subclasses of <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/> to cause the trigger to fire.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.ExceptionEvaluator.#ctor">
+            <summary>
+            Default ctor to allow dynamic creation through a configurator.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.ExceptionEvaluator.#ctor(System.Type,System.Boolean)">
+            <summary>
+            Constructs an evaluator and initializes to trigger on <paramref name="exType"/>
+            </summary>
+            <param name="exType">the type that triggers this evaluator.</param>
+            <param name="triggerOnSubClass">If true, this evaluator will trigger on subclasses of <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/>.</param>
+        </member>
+        <member name="M:log4net.Core.ExceptionEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Is this <paramref name="loggingEvent"/> the triggering event?
+            </summary>
+            <param name="loggingEvent">The event to check</param>
+            <returns>This method returns <c>true</c>, if the logging event Exception 
+            Type is <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/>. 
+            Otherwise it returns <c>false</c></returns>
+            <remarks>
+            <para>
+            This evaluator will trigger if the Exception Type of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.ExceptionEvaluator.ExceptionType">
+            <summary>
+            The type that triggers this evaluator.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.ExceptionEvaluator.TriggerOnSubclass">
+            <summary>
+            If true, this evaluator will trigger on subclasses of <see cref="P:log4net.Core.ExceptionEvaluator.ExceptionType"/>.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.IErrorHandler">
+            <summary>
+            Appenders may delegate their error handling to an <see cref="T:log4net.Core.IErrorHandler"/>.
+            </summary>
+            <remarks>
+            <para>
+            Error handling is a particularly tedious to get right because by
+            definition errors are hard to predict and to reproduce. 
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)">
+            <summary>
+            Handles the error and information about the error condition is passed as 
+            a parameter.
+            </summary>
+            <param name="message">The message associated with the error.</param>
+            <param name="e">The <see cref="T:System.Exception"/> that was thrown when the error occurred.</param>
+            <param name="errorCode">The error code associated with the error.</param>
+            <remarks>
+            <para>
+            Handles the error and information about the error condition is passed as 
+            a parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception)">
+            <summary>
+            Prints the error message passed as a parameter.
+            </summary>
+            <param name="message">The message associated with the error.</param>
+            <param name="e">The <see cref="T:System.Exception"/> that was thrown when the error occurred.</param>
+            <remarks>
+            <para>
+            See <see cref="M:Error(string,Exception,ErrorCode)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.IErrorHandler.Error(System.String)">
+            <summary>
+            Prints the error message passed as a parameter.
+            </summary>
+            <param name="message">The message associated with the error.</param>
+            <remarks>
+            <para>
+            See <see cref="M:Error(string,Exception,ErrorCode)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.IFixingRequired">
+            <summary>
+            Interface for objects that require fixing.
+            </summary>
+            <remarks>
+            <para>
+            Interface that indicates that the object requires fixing before it
+            can be taken outside the context of the appender's 
+            <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method.
+            </para>
+            <para>
+            When objects that implement this interface are stored 
+            in the context properties maps <see cref="T:log4net.GlobalContext"/>
+            <see cref="P:log4net.GlobalContext.Properties"/> and <see cref="T:log4net.ThreadContext"/>
+            <see cref="P:log4net.ThreadContext.Properties"/> are fixed 
+            (see <see cref="P:log4net.Core.LoggingEvent.Fix"/>) the <see cref="M:log4net.Core.IFixingRequired.GetFixedObject"/>
+            method will be called.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Core.IFixingRequired.GetFixedObject">
+            <summary>
+            Get a portable version of this object
+            </summary>
+            <returns>the portable instance of this object</returns>
+            <remarks>
+            <para>
+            Get a portable instance object that represents the current
+            state of this object. The portable object can be stored
+            and logged from any thread with identical results.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.ILogger">
+            <summary>
+            Interface that all loggers implement
+            </summary>
+            <remarks>
+            <para>
+            This interface supports logging events and testing if a level
+            is enabled for logging.
+            </para>
+            <para>
+            These methods will not throw exceptions. Note to implementor, ensure
+            that the implementation of these methods cannot allow an exception
+            to be thrown to the caller.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.ILogger.Log(System.Type,log4net.Core.Level,System.Object,System.Exception)">
+            <summary>
+            This generic form is intended to be used by wrappers.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="level">The level of the message to be logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">the exception to log, including its stack trace. Pass <c>null</c> to not log an exception.</param>
+            <remarks>
+            <para>
+            Generates a logging event for the specified <paramref name="level"/> using
+            the <paramref name="message"/> and <paramref name="exception"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.ILogger.Log(log4net.Core.LoggingEvent)">
+            <summary>
+            This is the most generic printing method that is intended to be used 
+            by wrappers.
+            </summary>
+            <param name="logEvent">The event being logged.</param>
+            <remarks>
+            <para>
+            Logs the specified logging event through this logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.ILogger.IsEnabledFor(log4net.Core.Level)">
+            <summary>
+            Checks if this logger is enabled for a given <see cref="T:log4net.Core.Level"/> passed as parameter.
+            </summary>
+            <param name="level">The level to check.</param>
+            <returns>
+            <c>true</c> if this logger is enabled for <c>level</c>, otherwise <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Test if this logger is going to log events of the specified <paramref name="level"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.ILogger.Name">
+            <summary>
+            Gets the name of the logger.
+            </summary>
+            <value>
+            The name of the logger.
+            </value>
+            <remarks>
+            <para>
+            The name of this logger
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.ILogger.Repository">
+            <summary>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
+            <c>Logger</c> instance is attached to.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this logger belongs to.
+            </value>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
+            <c>Logger</c> instance is attached to.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.ILoggerWrapper">
+            <summary>
+            Base interface for all wrappers
+            </summary>
+            <remarks>
+            <para>
+            Base interface for all wrappers.
+            </para>
+            <para>
+            All wrappers must implement this interface.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="P:log4net.Core.ILoggerWrapper.Logger">
+            <summary>
+            Get the implementation behind this wrapper object.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Core.ILogger"/> object that in implementing this object.
+            </value>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Core.ILogger"/> object that in implementing this
+            object. The <c>Logger</c> object may not 
+            be the same object as this object because of logger decorators.
+            This gets the actual underlying objects that is used to process
+            the log events.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LoggerRepositoryCreationEventHandler">
+            <summary>
+            Delegate used to handle logger repository creation event notifications
+            </summary>
+            <param name="sender">The <see cref="T:log4net.Core.IRepositorySelector"/> which created the repository.</param>
+            <param name="e">The <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> event args
+            that holds the <see cref="T:log4net.Repository.ILoggerRepository"/> instance that has been created.</param>
+            <remarks>
+            <para>
+            Delegate used to handle logger repository creation event notifications.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LoggerRepositoryCreationEventArgs">
+            <summary>
+            Provides data for the <see cref="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent"/> event.
+            </summary>
+            <remarks>
+            <para>
+            A <see cref="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent"/> 
+            event is raised every time a <see cref="T:log4net.Repository.ILoggerRepository"/> is created.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggerRepositoryCreationEventArgs.m_repository">
+            <summary>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LoggerRepositoryCreationEventArgs.#ctor(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Construct instance using <see cref="T:log4net.Repository.ILoggerRepository"/> specified
+            </summary>
+            <param name="repository">the <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created</param>
+            <remarks>
+            <para>
+            Construct instance using <see cref="T:log4net.Repository.ILoggerRepository"/> specified
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggerRepositoryCreationEventArgs.LoggerRepository">
+            <summary>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
+            </summary>
+            <value>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
+            </value>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.Level">
+            <summary>
+            Defines the default set of levels recognized by the system.
+            </summary>
+            <remarks>
+            <para>
+            Each <see cref="T:log4net.Core.LoggingEvent"/> has an associated <see cref="T:log4net.Core.Level"/>.
+            </para>
+            <para>
+            Levels have a numeric <see cref="P:log4net.Core.Level.Value"/> that defines the relative 
+            ordering between levels. Two Levels with the same <see cref="P:log4net.Core.Level.Value"/> 
+            are deemed to be equivalent.
+            </para>
+            <para>
+            The levels that are recognized by log4net are set for each <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and each repository can have different levels defined. The levels are stored
+            in the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/> on the repository. Levels are
+            looked up by name from the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>.
+            </para>
+            <para>
+            When logging at level INFO the actual level used is not <see cref="F:log4net.Core.Level.Info"/> but
+            the value of <c>LoggerRepository.LevelMap["INFO"]</c>. The default value for this is
+            <see cref="F:log4net.Core.Level.Info"/>, but this can be changed by reconfiguring the level map.
+            </para>
+            <para>
+            Each level has a <see cref="P:log4net.Core.Level.DisplayName"/> in addition to its <see cref="P:log4net.Core.Level.Name"/>. The 
+            <see cref="P:log4net.Core.Level.DisplayName"/> is the string that is written into the output log. By default
+            the display name is the same as the level name, but this can be used to alias levels
+            or to localize the log output.
+            </para>
+            <para>
+            Some of the predefined levels recognized by the system are:
+            </para>
+            <list type="bullet">
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Off"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Fatal"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Error"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Warn"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Info"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.Debug"/>.</description>
+            	</item>
+            	<item>
+            		<description><see cref="F:log4net.Core.Level.All"/>.</description>
+            	</item>
+            </list>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.Level.#ctor(System.Int32,System.String,System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="level">Integer value for this level, higher values represent more severe levels.</param>
+            <param name="levelName">The string name of this level.</param>
+            <param name="displayName">The display name for this level. This may be localized or otherwise different from the name</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.Level"/> class with
+            the specified level name and value.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.#ctor(System.Int32,System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="level">Integer value for this level, higher values represent more severe levels.</param>
+            <param name="levelName">The string name of this level.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.Level"/> class with
+            the specified level name and value.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.ToString">
+            <summary>
+            Returns the <see cref="T:System.String"/> representation of the current 
+            <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> representation of the current <see cref="T:log4net.Core.Level"/>.
+            </returns>
+            <remarks>
+            <para>
+            Returns the level <see cref="P:log4net.Core.Level.Name"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.Equals(System.Object)">
+            <summary>
+            Compares levels.
+            </summary>
+            <param name="o">The object to compare against.</param>
+            <returns><c>true</c> if the objects are equal.</returns>
+            <remarks>
+            <para>
+            Compares the levels of <see cref="T:log4net.Core.Level"/> instances, and 
+            defers to base class if the target object is not a <see cref="T:log4net.Core.Level"/>
+            instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.GetHashCode">
+            <summary>
+            Returns a hash code
+            </summary>
+            <returns>A hash code for the current <see cref="T:log4net.Core.Level"/>.</returns>
+            <remarks>
+            <para>
+            Returns a hash code suitable for use in hashing algorithms and data 
+            structures like a hash table.
+            </para>
+            <para>
+            Returns the hash code of the level <see cref="P:log4net.Core.Level.Value"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.CompareTo(System.Object)">
+            <summary>
+            Compares this instance to a specified object and returns an 
+            indication of their relative values.
+            </summary>
+            <param name="r">A <see cref="T:log4net.Core.Level"/> instance or <see langword="null"/> to compare with this instance.</param>
+            <returns>
+            A 32-bit signed integer that indicates the relative order of the 
+            values compared. The return value has these meanings:
+            <list type="table">
+            	<listheader>
+            		<term>Value</term>
+            		<description>Meaning</description>
+            	</listheader>
+            	<item>
+            		<term>Less than zero</term>
+            		<description>This instance is less than <paramref name="r"/>.</description>
+            	</item>
+            	<item>
+            		<term>Zero</term>
+            		<description>This instance is equal to <paramref name="r"/>.</description>
+            	</item>
+            	<item>
+            		<term>Greater than zero</term>
+            		<description>
+            			<para>This instance is greater than <paramref name="r"/>.</para>
+            			<para>-or-</para>
+            			<para><paramref name="r"/> is <see langword="null"/>.</para>
+            			</description>
+            	</item>
+            </list>
+            </returns>
+            <remarks>
+            <para>
+            <paramref name="r"/> must be an instance of <see cref="T:log4net.Core.Level"/> 
+            or <see langword="null"/>; otherwise, an exception is thrown.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentException"><paramref name="r"/> is not a <see cref="T:log4net.Core.Level"/>.</exception>
+        </member>
+        <member name="M:log4net.Core.Level.op_GreaterThan(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
+            is greater than another specified <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
+            <returns>
+            <c>true</c> if <paramref name="l"/> is greater than 
+            <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.op_LessThan(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
+            is less than another specified <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
+            <returns>
+            <c>true</c> if <paramref name="l"/> is less than 
+            <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.op_GreaterThanOrEqual(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
+            is greater than or equal to another specified <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
+            <returns>
+            <c>true</c> if <paramref name="l"/> is greater than or equal to 
+            <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.op_LessThanOrEqual(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
+            is less than or equal to another specified <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
+            <returns>
+            <c>true</c> if <paramref name="l"/> is less than or equal to 
+            <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.op_Equality(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether two specified <see cref="T:log4net.Core.Level"/> 
+            objects have the same value.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
+            <returns>
+            <c>true</c> if the value of <paramref name="l"/> is the same as the 
+            value of <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.op_Inequality(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Returns a value indicating whether two specified <see cref="T:log4net.Core.Level"/> 
+            objects have different values.
+            </summary>
+            <param name="l">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
+            <param name="r">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
+            <returns>
+            <c>true</c> if the value of <paramref name="l"/> is different from
+            the value of <paramref name="r"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.Level.Compare(log4net.Core.Level,log4net.Core.Level)">
+            <summary>
+            Compares two specified <see cref="T:log4net.Core.Level"/> instances.
+            </summary>
+            <param name="l">The first <see cref="T:log4net.Core.Level"/> to compare.</param>
+            <param name="r">The second <see cref="T:log4net.Core.Level"/> to compare.</param>
+            <returns>
+            A 32-bit signed integer that indicates the relative order of the 
+            two values compared. The return value has these meanings:
+            <list type="table">
+            	<listheader>
+            		<term>Value</term>
+            		<description>Meaning</description>
+            	</listheader>
+            	<item>
+            		<term>Less than zero</term>
+            		<description><paramref name="l"/> is less than <paramref name="r"/>.</description>
+            	</item>
+            	<item>
+            		<term>Zero</term>
+            		<description><paramref name="l"/> is equal to <paramref name="r"/>.</description>
+            	</item>
+            	<item>
+            		<term>Greater than zero</term>
+            		<description><paramref name="l"/> is greater than <paramref name="r"/>.</description>
+            	</item>
+            </list>
+            </returns>
+            <remarks>
+            <para>
+            Compares two levels.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.Level.Off">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Off"/> level designates a higher level than all the rest.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Log4Net_Debug">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Emergency"/> level designates very severe error events. 
+            System unusable, emergencies.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Emergency">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Emergency"/> level designates very severe error events. 
+            System unusable, emergencies.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Fatal">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Fatal"/> level designates very severe error events 
+            that will presumably lead the application to abort.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Alert">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Alert"/> level designates very severe error events. 
+            Take immediate action, alerts.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Critical">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Critical"/> level designates very severe error events. 
+            Critical condition, critical.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Severe">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Severe"/> level designates very severe error events.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Error">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Error"/> level designates error events that might 
+            still allow the application to continue running.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Warn">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Warn"/> level designates potentially harmful 
+            situations.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Notice">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Notice"/> level designates informational messages 
+            that highlight the progress of the application at the highest level.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Info">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Info"/> level designates informational messages that 
+            highlight the progress of the application at coarse-grained level.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Debug">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Debug"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Fine">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Fine"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Trace">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Trace"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Finer">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Finer"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Verbose">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Verbose"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.Finest">
+            <summary>
+            The <see cref="F:log4net.Core.Level.Finest"/> level designates fine-grained informational 
+            events that are most useful to debug an application.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.Level.All">
+            <summary>
+            The <see cref="F:log4net.Core.Level.All"/> level designates the lowest level possible.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.Level.Name">
+            <summary>
+            Gets the name of this level.
+            </summary>
+            <value>
+            The name of this level.
+            </value>
+            <remarks>
+            <para>
+            Gets the name of this level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.Level.Value">
+            <summary>
+            Gets the value of this level.
+            </summary>
+            <value>
+            The value of this level.
+            </value>
+            <remarks>
+            <para>
+            Gets the value of this level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.Level.DisplayName">
+            <summary>
+            Gets the display name of this level.
+            </summary>
+            <value>
+            The display name of this level.
+            </value>
+            <remarks>
+            <para>
+            Gets the display name of this level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LevelCollection">
+            <summary>
+            A strongly-typed collection of <see cref="T:log4net.Core.Level"/> objects.
+            </summary>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.ReadOnly(log4net.Core.LevelCollection)">
+            <summary>
+            Creates a read-only wrapper for a <c>LevelCollection</c> instance.
+            </summary>
+            <param name="list">list to create a readonly wrapper arround</param>
+            <returns>
+            A <c>LevelCollection</c> wrapper that is read-only.
+            </returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor">
+            <summary>
+            Initializes a new instance of the <c>LevelCollection</c> class
+            that is empty and has the default initial capacity.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor(System.Int32)">
+            <summary>
+            Initializes a new instance of the <c>LevelCollection</c> class
+            that has the specified initial capacity.
+            </summary>
+            <param name="capacity">
+            The number of elements that the new <c>LevelCollection</c> is initially capable of storing.
+            </param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.LevelCollection)">
+            <summary>
+            Initializes a new instance of the <c>LevelCollection</c> class
+            that contains elements copied from the specified <c>LevelCollection</c>.
+            </summary>
+            <param name="c">The <c>LevelCollection</c> whose elements are copied to the new collection.</param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.Level[])">
+            <summary>
+            Initializes a new instance of the <c>LevelCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Core.Level"/> array.
+            </summary>
+            <param name="a">The <see cref="T:log4net.Core.Level"/> array whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor(System.Collections.ICollection)">
+            <summary>
+            Initializes a new instance of the <c>LevelCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Core.Level"/> collection.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Core.Level"/> collection whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.LevelCollection.Tag)">
+            <summary>
+            Allow subclasses to avoid our default constructors
+            </summary>
+            <param name="tag"></param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.CopyTo(log4net.Core.Level[])">
+            <summary>
+            Copies the entire <c>LevelCollection</c> to a one-dimensional
+            <see cref="T:log4net.Core.Level"/> array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Core.Level"/> array to copy to.</param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.CopyTo(log4net.Core.Level[],System.Int32)">
+            <summary>
+            Copies the entire <c>LevelCollection</c> to a one-dimensional
+            <see cref="T:log4net.Core.Level"/> array, starting at the specified index of the target array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Core.Level"/> array to copy to.</param>
+            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Add(log4net.Core.Level)">
+            <summary>
+            Adds a <see cref="T:log4net.Core.Level"/> to the end of the <c>LevelCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Core.Level"/> to be added to the end of the <c>LevelCollection</c>.</param>
+            <returns>The index at which the value has been added.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Clear">
+            <summary>
+            Removes all elements from the <c>LevelCollection</c>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Clone">
+            <summary>
+            Creates a shallow copy of the <see cref="T:log4net.Core.LevelCollection"/>.
+            </summary>
+            <returns>A new <see cref="T:log4net.Core.LevelCollection"/> with a shallow copy of the collection data.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Contains(log4net.Core.Level)">
+            <summary>
+            Determines whether a given <see cref="T:log4net.Core.Level"/> is in the <c>LevelCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Core.Level"/> to check for.</param>
+            <returns><c>true</c> if <paramref name="item"/> is found in the <c>LevelCollection</c>; otherwise, <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.IndexOf(log4net.Core.Level)">
+            <summary>
+            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Core.Level"/>
+            in the <c>LevelCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Core.Level"/> to locate in the <c>LevelCollection</c>.</param>
+            <returns>
+            The zero-based index of the first occurrence of <paramref name="item"/> 
+            in the entire <c>LevelCollection</c>, if found; otherwise, -1.
+            </returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Insert(System.Int32,log4net.Core.Level)">
+            <summary>
+            Inserts an element into the <c>LevelCollection</c> at the specified index.
+            </summary>
+            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
+            <param name="item">The <see cref="T:log4net.Core.Level"/> to insert.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Remove(log4net.Core.Level)">
+            <summary>
+            Removes the first occurrence of a specific <see cref="T:log4net.Core.Level"/> from the <c>LevelCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Core.Level"/> to remove from the <c>LevelCollection</c>.</param>
+            <exception cref="T:System.ArgumentException">
+            The specified <see cref="T:log4net.Core.Level"/> was not found in the <c>LevelCollection</c>.
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.RemoveAt(System.Int32)">
+            <summary>
+            Removes the element at the specified index of the <c>LevelCollection</c>.
+            </summary>
+            <param name="index">The zero-based index of the element to remove.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through the <c>LevelCollection</c>.
+            </summary>
+            <returns>An <see cref="T:log4net.Core.LevelCollection.Enumerator"/> for the entire <c>LevelCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.AddRange(log4net.Core.LevelCollection)">
+            <summary>
+            Adds the elements of another <c>LevelCollection</c> to the current <c>LevelCollection</c>.
+            </summary>
+            <param name="x">The <c>LevelCollection</c> whose elements should be added to the end of the current <c>LevelCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.AddRange(log4net.Core.Level[])">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Core.Level"/> array to the current <c>LevelCollection</c>.
+            </summary>
+            <param name="x">The <see cref="T:log4net.Core.Level"/> array whose elements should be added to the end of the <c>LevelCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.AddRange(System.Collections.ICollection)">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Core.Level"/> collection to the current <c>LevelCollection</c>.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Core.Level"/> collection whose elements should be added to the end of the <c>LevelCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.TrimToSize">
+            <summary>
+            Sets the capacity to the actual number of elements.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.ValidateIndex(System.Int32)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.ValidateIndex(System.Int32,System.Boolean)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.Count">
+            <summary>
+            Gets the number of elements actually contained in the <c>LevelCollection</c>.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the collection is synchronized (thread-safe).
+            </summary>
+            <returns>false, because the backing type is an array, which is never thread-safe.</returns>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.Item(System.Int32)">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Core.Level"/> at the specified index.
+            </summary>
+            <param name="index">The zero-based index of the element to get or set.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.IsFixedSize">
+            <summary>
+            Gets a value indicating whether the collection has a fixed size.
+            </summary>
+            <value>true if the collection has a fixed size; otherwise, false. The default is false</value>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the IList is read-only.
+            </summary>
+            <value>true if the collection is read-only; otherwise, false. The default is false</value>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.Capacity">
+            <summary>
+            Gets or sets the number of elements the <c>LevelCollection</c> can contain.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LevelCollection.ILevelCollectionEnumerator">
+            <summary>
+            Supports type-safe iteration over a <see cref="T:log4net.Core.LevelCollection"/>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.ILevelCollectionEnumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.ILevelCollectionEnumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.ILevelCollectionEnumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LevelCollection.Tag">
+            <summary>
+            Type visible only to our subclasses
+            Used to access protected constructor
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LevelCollection.Tag.Default">
+            <summary>
+            A value
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LevelCollection.Enumerator">
+            <summary>
+            Supports simple iteration over a <see cref="T:log4net.Core.LevelCollection"/>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Enumerator.#ctor(log4net.Core.LevelCollection)">
+            <summary>
+            Initializes a new instance of the <c>Enumerator</c> class.
+            </summary>
+            <param name="tc"></param>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Enumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Core.LevelCollection.Enumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LevelCollection.Enumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LevelEvaluator">
+            <summary>
+            An evaluator that triggers at a threshold level
+            </summary>
+            <remarks>
+            <para>
+            This evaluator will trigger if the level of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
+            level.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.LevelEvaluator.m_threshold">
+            <summary>
+            The threshold for triggering
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelEvaluator.#ctor">
+            <summary>
+            Create a new evaluator using the <see cref="F:log4net.Core.Level.Off"/> threshold.
+            </summary>
+            <remarks>
+            <para>
+            Create a new evaluator using the <see cref="F:log4net.Core.Level.Off"/> threshold.
+            </para>
+            <para>
+            This evaluator will trigger if the level of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
+            level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelEvaluator.#ctor(log4net.Core.Level)">
+            <summary>
+            Create a new evaluator using the specified <see cref="T:log4net.Core.Level"/> threshold.
+            </summary>
+            <param name="threshold">the threshold to trigger at</param>
+            <remarks>
+            <para>
+            Create a new evaluator using the specified <see cref="T:log4net.Core.Level"/> threshold.
+            </para>
+            <para>
+            This evaluator will trigger if the level of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
+            level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Is this <paramref name="loggingEvent"/> the triggering event?
+            </summary>
+            <param name="loggingEvent">The event to check</param>
+            <returns>This method returns <c>true</c>, if the event level
+            is equal or higher than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>. 
+            Otherwise it returns <c>false</c></returns>
+            <remarks>
+            <para>
+            This evaluator will trigger if the level of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
+            level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LevelEvaluator.Threshold">
+            <summary>
+            the threshold to trigger at
+            </summary>
+            <value>
+            The <see cref="T:log4net.Core.Level"/> that will cause this evaluator to trigger
+            </value>
+            <remarks>
+            <para>
+            This evaluator will trigger if the level of the event
+            passed to <see cref="M:IsTriggeringEvent(LoggingEvent)"/>
+            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
+            level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LevelMap">
+            <summary>
+            Mapping between string name and Level object
+            </summary>
+            <remarks>
+            <para>
+            Mapping between string name and <see cref="T:log4net.Core.Level"/> object.
+            This mapping is held separately for each <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            The level name is case insensitive.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.LevelMap.m_mapName2Level">
+            <summary>
+            Mapping from level name to Level object. The
+            level name is case insensitive
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LevelMap.#ctor">
+            <summary>
+            Construct the level map
+            </summary>
+            <remarks>
+            <para>
+            Construct the level map.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelMap.Clear">
+            <summary>
+            Clear the internal maps of all levels
+            </summary>
+            <remarks>
+            <para>
+            Clear the internal maps of all levels
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelMap.Add(System.String,System.Int32)">
+            <summary>
+            Create a new Level and add it to the map
+            </summary>
+            <param name="name">the string to display for the Level</param>
+            <param name="value">the level value to give to the Level</param>
+            <remarks>
+            <para>
+            Create a new Level and add it to the map
+            </para>
+            </remarks>
+            <seealso cref="M:Add(string,int,string)"/>
+        </member>
+        <member name="M:log4net.Core.LevelMap.Add(System.String,System.Int32,System.String)">
+            <summary>
+            Create a new Level and add it to the map
+            </summary>
+            <param name="name">the string to display for the Level</param>
+            <param name="value">the level value to give to the Level</param>
+            <param name="displayName">the display name to give to the Level</param>
+            <remarks>
+            <para>
+            Create a new Level and add it to the map
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelMap.Add(log4net.Core.Level)">
+            <summary>
+            Add a Level to the map
+            </summary>
+            <param name="level">the Level to add</param>
+            <remarks>
+            <para>
+            Add a Level to the map
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LevelMap.LookupWithDefault(log4net.Core.Level)">
+            <summary>
+            Lookup a named level from the map
+            </summary>
+            <param name="defaultLevel">the name of the level to lookup is taken from this level. 
+            If the level is not set on the map then this level is added</param>
+            <returns>the level in the map with the name specified</returns>
+            <remarks>
+            <para>
+            Lookup a named level from the map. The name of the level to lookup is taken
+            from the <see cref="P:log4net.Core.Level.Name"/> property of the <paramref name="defaultLevel"/>
+            argument.
+            </para>
+            <para>
+            If no level with the specified name is found then the 
+            <paramref name="defaultLevel"/> argument is added to the level map
+            and returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LevelMap.Item(System.String)">
+            <summary>
+            Lookup a <see cref="T:log4net.Core.Level"/> by name
+            </summary>
+            <param name="name">The name of the Level to lookup</param>
+            <returns>a Level from the map with the name specified</returns>
+            <remarks>
+            <para>
+            Returns the <see cref="T:log4net.Core.Level"/> from the
+            map with the name specified. If the no level is
+            found then <c>null</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LevelMap.AllLevels">
+            <summary>
+            Return all possible levels as a list of Level objects.
+            </summary>
+            <returns>all possible levels as a list of Level objects</returns>
+            <remarks>
+            <para>
+            Return all possible levels as a list of Level objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LocationInfo">
+            <summary>
+            The internal representation of caller location information.
+            </summary>
+            <remarks>
+            <para>
+            This class uses the <c>System.Diagnostics.StackTrace</c> class to generate
+            a call stack. The caller's information is then extracted from this stack.
+            </para>
+            <para>
+            The <c>System.Diagnostics.StackTrace</c> class is not supported on the 
+            .NET Compact Framework 1.0 therefore caller location information is not
+            available on that framework.
+            </para>
+            <para>
+            The <c>System.Diagnostics.StackTrace</c> class has this to say about Release builds:
+            </para>
+            <para>
+            "StackTrace information will be most informative with Debug build configurations. 
+            By default, Debug builds include debug symbols, while Release builds do not. The 
+            debug symbols contain most of the file, method name, line number, and column 
+            information used in constructing StackFrame and StackTrace objects. StackTrace 
+            might not report as many method calls as expected, due to code transformations 
+            that occur during optimization."
+            </para>
+            <para>
+            This means that in a Release build the caller information may be incomplete or may 
+            not exist at all! Therefore caller location information cannot be relied upon in a Release build.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Core.LocationInfo.NA">
+            <summary>
+            When location information is not available the constant
+            <c>NA</c> is returned. Current value of this string
+            constant is <b>?</b>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LocationInfo.#ctor(System.Type)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LocationInfo"/>
+            class based on the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LocationInfo.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="className">The fully qualified class name.</param>
+            <param name="methodName">The method name.</param>
+            <param name="fileName">The file name.</param>
+            <param name="lineNumber">The line number of the method within the file.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LocationInfo"/>
+            class with the specified data.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LocationInfo.declaringType">
+            <summary>
+            The fully qualified type of the LocationInfo class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.ClassName">
+            <summary>
+            Gets the fully qualified class name of the caller making the logging 
+            request.
+            </summary>
+            <value>
+            The fully qualified class name of the caller making the logging 
+            request.
+            </value>
+            <remarks>
+            <para>
+            Gets the fully qualified class name of the caller making the logging 
+            request.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.FileName">
+            <summary>
+            Gets the file name of the caller.
+            </summary>
+            <value>
+            The file name of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the file name of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.LineNumber">
+            <summary>
+            Gets the line number of the caller.
+            </summary>
+            <value>
+            The line number of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the line number of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.MethodName">
+            <summary>
+            Gets the method name of the caller.
+            </summary>
+            <value>
+            The method name of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the method name of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.FullInfo">
+            <summary>
+            Gets all available caller information
+            </summary>
+            <value>
+            All available caller information, in the format
+            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
+            </value>
+            <remarks>
+            <para>
+            Gets all available caller information, in the format
+            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LocationInfo.StackFrames">
+            <summary>
+            Gets the stack frames from the stack trace of the caller making the log request
+            </summary>
+        </member>
+        <member name="T:log4net.Core.LoggerManager">
+            <summary>
+            Static manager that controls the creation of repositories
+            </summary>
+            <remarks>
+            <para>
+            Static manager that controls the creation of repositories
+            </para>
+            <para>
+            This class is used by the wrapper managers (e.g. <see cref="T:log4net.LogManager"/>)
+            to provide access to the <see cref="T:log4net.Core.ILogger"/> objects.
+            </para>
+            <para>
+            This manager also holds the <see cref="T:log4net.Core.IRepositorySelector"/> that is used to
+            lookup and create repositories. The selector can be set either programmatically using
+            the <see cref="P:log4net.Core.LoggerManager.RepositorySelector"/> property, or by setting the <c>log4net.RepositorySelector</c>
+            AppSetting in the applications config file to the fully qualified type name of the
+            selector to use. 
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.#ctor">
+            <summary>
+            Private constructor to prevent instances. Only static methods should be used.
+            </summary>
+            <remarks>
+            <para>
+            Private constructor to prevent instances. Only static methods should be used.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.#cctor">
+            <summary>
+            Hook the shutdown event
+            </summary>
+            <remarks>
+            <para>
+            On the full .NET runtime, the static constructor hooks up the 
+            <c>AppDomain.ProcessExit</c> and <c>AppDomain.DomainUnload</c>> events. 
+            These are used to shutdown the log4net system as the application exits.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.RegisterAppDomainEvents">
+            <summary>
+            Register for ProcessExit and DomainUnload events on the AppDomain
+            </summary>
+            <remarks>
+            <para>
+            This needs to be in a separate method because the events make
+            a LinkDemand for the ControlAppDomain SecurityPermission. Because
+            this is a LinkDemand it is demanded at JIT time. Therefore we cannot
+            catch the exception in the method itself, we have to catch it in the
+            caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLoggerRepository(System.String)">
+            <summary>
+            Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <param name="repository">the repository to lookup in</param>
+            <returns>Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repository"/> argument.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLoggerRepository(System.Reflection.Assembly)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetRepository(System.String)">
+            <summary>
+            Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <param name="repository">the repository to lookup in</param>
+            <returns>Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repository"/> argument.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetRepository(System.Reflection.Assembly)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+            <remarks>
+            <para>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.Exists(System.String,System.String)">
+            <summary>
+            Returns the named logger if it exists.
+            </summary>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="name">The fully qualified logger name to look for.</param>
+            <returns>
+            The logger found, or <c>null</c> if the named logger does not exist in the
+            specified repository.
+            </returns>
+            <remarks>
+            <para>
+            If the named logger exists (in the specified repository) then it
+            returns a reference to the logger, otherwise it returns
+            <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.Exists(System.Reflection.Assembly,System.String)">
+            <summary>
+            Returns the named logger if it exists.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <param name="name">The fully qualified logger name to look for.</param>
+            <returns>
+            The logger found, or <c>null</c> if the named logger does not exist in the
+            specified assembly's repository.
+            </returns>
+            <remarks>
+            <para>
+            If the named logger exists (in the specified assembly's repository) then it
+            returns a reference to the logger, otherwise it returns
+            <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetCurrentLoggers(System.String)">
+            <summary>
+            Returns all the currently defined loggers in the specified repository.
+            </summary>
+            <param name="repository">The repository to lookup in.</param>
+            <returns>All the defined loggers.</returns>
+            <remarks>
+            <para>
+            The root logger is <b>not</b> included in the returned array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetCurrentLoggers(System.Reflection.Assembly)">
+            <summary>
+            Returns all the currently defined loggers in the specified assembly's repository.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <returns>All the defined loggers.</returns>
+            <remarks>
+            <para>
+            The root logger is <b>not</b> included in the returned array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLogger(System.String,System.String)">
+            <summary>
+            Retrieves or creates a named logger.
+            </summary>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="name">The name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+            <remarks>
+            <para>
+            Retrieves a logger named as the <paramref name="name"/>
+            parameter. If the named logger already exists, then the
+            existing instance will be returned. Otherwise, a new instance is
+            created.
+            </para>
+            <para>
+            By default, loggers do not have a set level but inherit
+            it from the hierarchy. This is one of the central features of
+            log4net.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLogger(System.Reflection.Assembly,System.String)">
+            <summary>
+            Retrieves or creates a named logger.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <param name="name">The name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+            <remarks>
+            <para>
+            Retrieves a logger named as the <paramref name="name"/>
+            parameter. If the named logger already exists, then the
+            existing instance will be returned. Otherwise, a new instance is
+            created.
+            </para>
+            <para>
+            By default, loggers do not have a set level but inherit
+            it from the hierarchy. This is one of the central features of
+            log4net.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLogger(System.String,System.Type)">
+            <summary>
+            Shorthand for <see cref="M:LogManager.GetLogger(string)"/>.
+            </summary>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="type">The <paramref name="type"/> of which the fullname will be used as the name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+            <remarks>
+            <para>
+            Gets the logger for the fully qualified name of the type specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetLogger(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Shorthand for <see cref="M:LogManager.GetLogger(string)"/>.
+            </summary>
+            <param name="repositoryAssembly">the assembly to use to lookup the repository</param>
+            <param name="type">The <paramref name="type"/> of which the fullname will be used as the name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+            <remarks>
+            <para>
+            Gets the logger for the fully qualified name of the type specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.Shutdown">
+            <summary>
+            Shuts down the log4net system.
+            </summary>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in all the
+            default repositories.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>
+            The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.ShutdownRepository(System.String)">
+            <summary>
+            Shuts down the repository for the repository specified.
+            </summary>
+            <param name="repository">The repository to shutdown.</param>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in the
+            repository for the <paramref name="repository"/> specified.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>
+            The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.ShutdownRepository(System.Reflection.Assembly)">
+            <summary>
+            Shuts down the repository for the repository specified.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in the
+            repository for the repository. The repository is looked up using
+            the <paramref name="repositoryAssembly"/> specified.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>
+            The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.ResetConfiguration(System.String)">
+            <summary>
+            Resets all values contained in this repository instance to their defaults.
+            </summary>
+            <param name="repository">The repository to reset.</param>
+            <remarks>
+            <para>
+            Resets all values contained in the repository instance to their
+            defaults.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set its default "off" value.
+            </para>		
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.ResetConfiguration(System.Reflection.Assembly)">
+            <summary>
+            Resets all values contained in this repository instance to their defaults.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository to reset.</param>
+            <remarks>
+            <para>
+            Resets all values contained in the repository instance to their
+            defaults.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set its default "off" value.
+            </para>		
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.String)">
+            <summary>
+            Creates a repository with the specified name.
+            </summary>
+            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
+            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.String)">
+            <summary>
+            Creates a repository with the specified name.
+            </summary>
+            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
+            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.String,System.Type)">
+            <summary>
+            Creates a repository with the specified name and repository type.
+            </summary>
+            <param name="repository">The name of the repository, this must be unique to the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An Exception will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.String,System.Type)">
+            <summary>
+            Creates a repository with the specified name and repository type.
+            </summary>
+            <param name="repository">The name of the repository, this must be unique to the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An Exception will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Creates a repository for the specified assembly and repository type.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Creates a repository for the specified assembly and repository type.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetAllRepositories">
+            <summary>
+            Gets an array of all currently defined repositories.
+            </summary>
+            <returns>An array of all the known <see cref="T:log4net.Repository.ILoggerRepository"/> objects.</returns>
+            <remarks>
+            <para>
+            Gets an array of all currently defined repositories.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.GetVersionInfo">
+            <summary>
+            Internal method to get pertinent version info.
+            </summary>
+            <returns>A string of version info.</returns>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.OnDomainUnload(System.Object,System.EventArgs)">
+            <summary>
+            Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires
+            </summary>
+            <param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
+            <param name="e">null</param>
+            <remarks>
+            <para>
+            Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires.
+            </para>
+            <para>
+            When the event is triggered the log4net system is <see cref="M:Shutdown()"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggerManager.OnProcessExit(System.Object,System.EventArgs)">
+            <summary>
+            Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires
+            </summary>
+            <param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
+            <param name="e">null</param>
+            <remarks>
+            <para>
+            Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires.
+            </para>
+            <para>
+            When the event is triggered the log4net system is <see cref="M:Shutdown()"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggerManager.declaringType">
+            <summary>
+            The fully qualified type of the LoggerManager class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggerManager.s_repositorySelector">
+            <summary>
+            Initialize the default repository selector
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LoggerManager.RepositorySelector">
+            <summary>
+            Gets or sets the repository selector used by the <see cref="T:log4net.LogManager"/>.
+            </summary>
+            <value>
+            The repository selector used by the <see cref="T:log4net.LogManager"/>.
+            </value>
+            <remarks>
+            <para>
+            The repository selector (<see cref="T:log4net.Core.IRepositorySelector"/>) is used by 
+            the <see cref="T:log4net.LogManager"/> to create and select repositories 
+            (<see cref="T:log4net.Repository.ILoggerRepository"/>).
+            </para>
+            <para>
+            The caller to <see cref="T:log4net.LogManager"/> supplies either a string name 
+            or an assembly (if not supplied the assembly is inferred using 
+            <see cref="M:Assembly.GetCallingAssembly()"/>).
+            </para>
+            <para>
+            This context is used by the selector to lookup a specific repository.
+            </para>
+            <para>
+            For the full .NET Framework, the default repository is <c>DefaultRepositorySelector</c>;
+            for the .NET Compact Framework <c>CompactRepositorySelector</c> is the default
+            repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LoggerWrapperImpl">
+            <summary>
+            Implementation of the <see cref="T:log4net.Core.ILoggerWrapper"/> interface.
+            </summary>
+            <remarks>
+            <para>
+            This class should be used as the base for all wrapper implementations.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.LoggerWrapperImpl.#ctor(log4net.Core.ILogger)">
+            <summary>
+            Constructs a new wrapper for the specified logger.
+            </summary>
+            <param name="logger">The logger to wrap.</param>
+            <remarks>
+            <para>
+            Constructs a new wrapper for the specified logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggerWrapperImpl.m_logger">
+            <summary>
+            The logger that this object is wrapping
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LoggerWrapperImpl.Logger">
+            <summary>
+            Gets the implementation behind this wrapper object.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Core.ILogger"/> object that this object is implementing.
+            </value>
+            <remarks>
+            <para>
+            The <c>Logger</c> object may not be the same object as this object 
+            because of logger decorators.
+            </para>
+            <para>
+            This gets the actual underlying objects that is used to process
+            the log events.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LoggingEventData">
+            <summary>
+            Portable data structure used by <see cref="T:log4net.Core.LoggingEvent"/>
+            </summary>
+            <remarks>
+            <para>
+            Portable data structure used by <see cref="T:log4net.Core.LoggingEvent"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.LoggerName">
+            <summary>
+            The logger name.
+            </summary>
+            <remarks>
+            <para>
+            The logger name.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.Level">
+            <summary>
+            Level of logging event.
+            </summary>
+            <remarks>
+            <para>
+            Level of logging event. Level cannot be Serializable
+            because it is a flyweight.  Due to its special serialization it
+            cannot be declared final either.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.Message">
+            <summary>
+            The application supplied message.
+            </summary>
+            <remarks>
+            <para>
+            The application supplied message of logging event.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.ThreadName">
+            <summary>
+            The name of thread
+            </summary>
+            <remarks>
+            <para>
+            The name of thread in which this logging event was generated
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.TimeStamp">
+            <summary>
+            Gets or sets the local time the event was logged
+            </summary>
+            <remarks>
+            <para>
+            Prefer using the <see cref="P:log4net.Core.LoggingEventData.TimeStampUtc"/> setter, since local time can be ambiguous.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.LocationInfo">
+            <summary>
+            Location information for the caller.
+            </summary>
+            <remarks>
+            <para>
+            Location information for the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.UserName">
+            <summary>
+            String representation of the user
+            </summary>
+            <remarks>
+            <para>
+            String representation of the user's windows name,
+            like DOMAIN\username
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.Identity">
+            <summary>
+            String representation of the identity.
+            </summary>
+            <remarks>
+            <para>
+            String representation of the current thread's principal identity.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.ExceptionString">
+            <summary>
+            The string representation of the exception
+            </summary>
+            <remarks>
+            <para>
+            The string representation of the exception
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.Domain">
+            <summary>
+            String representation of the AppDomain.
+            </summary>
+            <remarks>
+            <para>
+            String representation of the AppDomain.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEventData.Properties">
+            <summary>
+            Additional event specific properties
+            </summary>
+            <remarks>
+            <para>
+            A logger or an appender may attach additional
+            properties to specific events. These properties
+            have a string key and an object value.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEventData.TimeStampUtc">
+            <summary>
+            Gets or sets the UTC time the event was logged
+            </summary>
+            <remarks>
+            <para>
+            The TimeStamp is stored in the UTC time zone.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.FixFlags">
+            <summary>
+            Flags passed to the <see cref="P:log4net.Core.LoggingEvent.Fix"/> property
+            </summary>
+            <remarks>
+            <para>
+            Flags passed to the <see cref="P:log4net.Core.LoggingEvent.Fix"/> property
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Mdc">
+            <summary>
+            Fix the MDC
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Ndc">
+            <summary>
+            Fix the NDC
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Message">
+            <summary>
+            Fix the rendered message
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.ThreadName">
+            <summary>
+            Fix the thread name
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.LocationInfo">
+            <summary>
+            Fix the callers location information
+            </summary>
+            <remarks>
+            CAUTION: Very slow to generate
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.FixFlags.UserName">
+            <summary>
+            Fix the callers windows user name
+            </summary>
+            <remarks>
+            CAUTION: Slow to generate
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Domain">
+            <summary>
+            Fix the domain friendly name
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Identity">
+            <summary>
+            Fix the callers principal name
+            </summary>
+            <remarks>
+            CAUTION: May be slow to generate
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Exception">
+            <summary>
+            Fix the exception text
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Properties">
+            <summary>
+            Fix the event properties. Active properties must implement <see cref="T:log4net.Core.IFixingRequired"/> in order to be eligible for fixing.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.None">
+            <summary>
+            No fields fixed
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.All">
+            <summary>
+            All fields fixed
+            </summary>
+        </member>
+        <member name="F:log4net.Core.FixFlags.Partial">
+            <summary>
+            Partial fields fixed
+            </summary>
+            <remarks>
+            <para>
+            This set of partial fields gives good performance. The following fields are fixed:
+            </para>
+            <list type="bullet">
+            <item><description><see cref="F:log4net.Core.FixFlags.Message"/></description></item>
+            <item><description><see cref="F:log4net.Core.FixFlags.ThreadName"/></description></item>
+            <item><description><see cref="F:log4net.Core.FixFlags.Exception"/></description></item>
+            <item><description><see cref="F:log4net.Core.FixFlags.Domain"/></description></item>
+            <item><description><see cref="F:log4net.Core.FixFlags.Properties"/></description></item>
+            </list>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LoggingEvent">
+            <summary>
+            The internal representation of logging events. 
+            </summary>
+            <remarks>
+            <para>
+            When an affirmative decision is made to log then a 
+            <see cref="T:log4net.Core.LoggingEvent"/> instance is created. This instance 
+            is passed around to the different log4net components.
+            </para>
+            <para>
+            This class is of concern to those wishing to extend log4net.
+            </para>
+            <para>
+            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
+            are considered volatile, that is the values are correct at the
+            time the event is delivered to appenders, but will not be consistent
+            at any time afterwards. If an event is to be stored and then processed
+            at a later time these volatile values must be fixed by calling
+            <see cref="M:FixVolatileData()"/>. There is a performance penalty
+            for incurred by calling <see cref="M:FixVolatileData()"/> but it
+            is essential to maintaining data consistency.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Douglas de la Torre</author>
+            <author>Daniel Cazzulino</author>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.HostNameProperty">
+            <summary>
+            The key into the Properties map for the host name value.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.IdentityProperty">
+            <summary>
+            The key into the Properties map for the thread identity value.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.UserNameProperty">
+            <summary>
+            The key into the Properties map for the user name value.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,System.String,log4net.Core.Level,System.Object,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class
+            from the supplied parameters.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="repository">The repository this event is logged in.</param>
+            <param name="loggerName">The name of the logger of this event.</param>
+            <param name="level">The level of this event.</param>
+            <param name="message">The message of this event.</param>
+            <param name="exception">The exception for this event.</param>
+            <remarks>
+            <para>
+            Except <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/>, <see cref="P:log4net.Core.LoggingEvent.Level"/> and <see cref="P:log4net.Core.LoggingEvent.LoggerName"/>, 
+            all fields of <c>LoggingEvent</c> are filled when actually needed. Call
+            <see cref="M:FixVolatileData()"/> to cache all data locally
+            to prevent inconsistencies.
+            </para>
+            <para>This method is called by the log4net framework
+            to create a logging event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,log4net.Core.LoggingEventData,log4net.Core.FixFlags)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
+            using specific data.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="repository">The repository this event is logged in.</param>
+            <param name="data">Data used to initialize the logging event.</param>
+            <param name="fixedData">The fields in the <paranref name="data"/> struct that have already been fixed.</param>
+            <remarks>
+            <para>
+            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
+            to be created independently of the log4net framework. This can
+            be useful if you require a custom serialization scheme.
+            </para>
+            <para>
+            Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an 
+            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
+            </para>
+            <para>
+            The <paramref name="fixedData"/> parameter should be used to specify which fields in the
+            <paramref name="data"/> struct have been preset. Fields not specified in the <paramref name="fixedData"/>
+            will be captured from the environment if requested or fixed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,log4net.Core.LoggingEventData)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
+            using specific data.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="repository">The repository this event is logged in.</param>
+            <param name="data">Data used to initialize the logging event.</param>
+            <remarks>
+            <para>
+            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
+            to be created independently of the log4net framework. This can
+            be useful if you require a custom serialization scheme.
+            </para>
+            <para>
+            Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an 
+            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
+            </para>
+            <para>
+            This constructor sets this objects <see cref="P:log4net.Core.LoggingEvent.Fix"/> flags to <see cref="F:log4net.Core.FixFlags.All"/>,
+            this assumes that all the data relating to this event is passed in via the <paramref name="data"/>
+            parameter and no other data should be captured from the environment.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.#ctor(log4net.Core.LoggingEventData)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
+            using specific data.
+            </summary>
+            <param name="data">Data used to initialize the logging event.</param>
+            <remarks>
+            <para>
+            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
+            to be created independently of the log4net framework. This can
+            be useful if you require a custom serialization scheme.
+            </para>
+            <para>
+            Use the <see cref="M:GetLoggingEventData(FixFlags)"/> method to obtain an 
+            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
+            </para>
+            <para>
+            This constructor sets this objects <see cref="P:log4net.Core.LoggingEvent.Fix"/> flags to <see cref="F:log4net.Core.FixFlags.All"/>,
+            this assumes that all the data relating to this event is passed in via the <paramref name="data"/>
+            parameter and no other data should be captured from the environment.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization constructor
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
+            with serialized data.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.EnsureRepository(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Ensure that the repository is set.
+            </summary>
+            <param name="repository">the value for the repository</param>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)">
+            <summary>
+            Write the rendered message to a TextWriter
+            </summary>
+            <param name="writer">the writer to write the message to</param>
+            <remarks>
+            <para>
+            Unlike the <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property this method
+            does store the message data in the internal cache. Therefore 
+            if called only once this method should be faster than the
+            <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property, however if the message is
+            to be accessed multiple times then the property will be more efficient.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate with data.</param>
+            <param name="context">The destination for this serialization.</param>
+            <remarks>
+            <para>
+            The data in this event must be fixed before it can be serialized.
+            </para>
+            <para>
+            The <see cref="M:FixVolatileData()"/> method must be called during the
+            <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method call if this event 
+            is to be used outside that method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetLoggingEventData">
+            <summary>
+            Gets the portable data for this <see cref="T:log4net.Core.LoggingEvent"/>.
+            </summary>
+            <returns>The <see cref="T:log4net.Core.LoggingEventData"/> for this event.</returns>
+            <remarks>
+            <para>
+            A new <see cref="T:log4net.Core.LoggingEvent"/> can be constructed using a
+            <see cref="T:log4net.Core.LoggingEventData"/> instance.
+            </para>
+            <para>
+            Does a <see cref="F:log4net.Core.FixFlags.Partial"/> fix of the data
+            in the logging event before returning the event data.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetLoggingEventData(log4net.Core.FixFlags)">
+            <summary>
+            Gets the portable data for this <see cref="T:log4net.Core.LoggingEvent"/>.
+            </summary>
+            <param name="fixFlags">The set of data to ensure is fixed in the LoggingEventData</param>
+            <returns>The <see cref="T:log4net.Core.LoggingEventData"/> for this event.</returns>
+            <remarks>
+            <para>
+            A new <see cref="T:log4net.Core.LoggingEvent"/> can be constructed using a
+            <see cref="T:log4net.Core.LoggingEventData"/> instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetExceptionStrRep">
+            <summary>
+            Returns this event's exception's rendered using the 
+            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </summary>
+            <returns>
+            This event's exception's rendered using the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </returns>
+            <remarks>
+            <para>
+            <b>Obsolete. Use <see cref="M:log4net.Core.LoggingEvent.GetExceptionString"/> instead.</b>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetExceptionString">
+            <summary>
+            Returns this event's exception's rendered using the 
+            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </summary>
+            <returns>
+            This event's exception's rendered using the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </returns>
+            <remarks>
+            <para>
+            Returns this event's exception's rendered using the 
+            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.FixVolatileData">
+            <summary>
+            Fix instance fields that hold volatile data.
+            </summary>
+            <remarks>
+            <para>
+            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
+            are considered volatile, that is the values are correct at the
+            time the event is delivered to appenders, but will not be consistent
+            at any time afterwards. If an event is to be stored and then processed
+            at a later time these volatile values must be fixed by calling
+            <see cref="M:FixVolatileData()"/>. There is a performance penalty
+            incurred by calling <see cref="M:FixVolatileData()"/> but it
+            is essential to maintaining data consistency.
+            </para>
+            <para>
+            Calling <see cref="M:FixVolatileData()"/> is equivalent to
+            calling <see cref="M:FixVolatileData(bool)"/> passing the parameter
+            <c>false</c>.
+            </para>
+            <para>
+            See <see cref="M:FixVolatileData(bool)"/> for more
+            information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.FixVolatileData(System.Boolean)">
+            <summary>
+            Fixes instance fields that hold volatile data.
+            </summary>
+            <param name="fastButLoose">Set to <c>true</c> to not fix data that takes a long time to fix.</param>
+            <remarks>
+            <para>
+            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
+            are considered volatile, that is the values are correct at the
+            time the event is delivered to appenders, but will not be consistent
+            at any time afterwards. If an event is to be stored and then processed
+            at a later time these volatile values must be fixed by calling
+            <see cref="M:FixVolatileData()"/>. There is a performance penalty
+            for incurred by calling <see cref="M:FixVolatileData()"/> but it
+            is essential to maintaining data consistency.
+            </para>
+            <para>
+            The <paramref name="fastButLoose"/> param controls the data that
+            is fixed. Some of the data that can be fixed takes a long time to 
+            generate, therefore if you do not require those settings to be fixed
+            they can be ignored by setting the <paramref name="fastButLoose"/> param
+            to <c>true</c>. This setting will ignore the <see cref="P:log4net.Core.LoggingEvent.LocationInformation"/>
+            and <see cref="P:log4net.Core.LoggingEvent.UserName"/> settings.
+            </para>
+            <para>
+            Set <paramref name="fastButLoose"/> to <c>false</c> to ensure that all 
+            settings are fixed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.FixVolatileData(log4net.Core.FixFlags)">
+            <summary>
+            Fix the fields specified by the <see cref="T:log4net.Core.FixFlags"/> parameter
+            </summary>
+            <param name="flags">the fields to fix</param>
+            <remarks>
+            <para>
+            Only fields specified in the <paramref name="flags"/> will be fixed.
+            Fields will not be fixed if they have previously been fixed.
+            It is not possible to 'unfix' a field.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.LookupProperty(System.String)">
+            <summary>
+            Lookup a composite property in this event
+            </summary>
+            <param name="key">the key for the property to lookup</param>
+            <returns>the value for the property</returns>
+            <remarks>
+            <para>
+            This event has composite properties that combine together properties from
+            several different contexts in the following order:
+            <list type="definition">
+            	<item>
+            		<term>this events properties</term>
+            		<description>
+            		This event has <see cref="P:log4net.Core.LoggingEvent.Properties"/> that can be set. These 
+            		properties are specific to this event only.
+            		</description>
+            	</item>
+            	<item>
+            		<term>the thread properties</term>
+            		<description>
+            		The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
+            		thread. These properties are shared by all events logged on this thread.
+            		</description>
+            	</item>
+            	<item>
+            		<term>the global properties</term>
+            		<description>
+            		The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
+            		properties are shared by all the threads in the AppDomain.
+            		</description>
+            	</item>
+            </list>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LoggingEvent.GetProperties">
+            <summary>
+            Get all the composite properties in this event
+            </summary>
+            <returns>the <see cref="T:log4net.Util.PropertiesDictionary"/> containing all the properties</returns>
+            <remarks>
+            <para>
+            See <see cref="M:log4net.Core.LoggingEvent.LookupProperty(System.String)"/> for details of the composite properties 
+            stored by the event.
+            </para>
+            <para>
+            This method returns a single <see cref="T:log4net.Util.PropertiesDictionary"/> containing all the
+            properties defined for this event.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_data">
+            <summary>
+            The internal logging event data.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_compositeProperties">
+            <summary>
+            The internal logging event data.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_eventProperties">
+            <summary>
+            The internal logging event data.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_callerStackBoundaryDeclaringType">
+            <summary>
+            The fully qualified Type of the calling 
+            logger class in the stack frame (i.e. the declaring type of the method).
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_message">
+            <summary>
+            The application supplied message of logging event.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_thrownException">
+            <summary>
+            The exception that was thrown.
+            </summary>
+            <remarks>
+            This is not serialized. The string representation
+            is serialized instead.
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_repository">
+            <summary>
+            The repository that generated the logging event
+            </summary>
+            <remarks>
+            This is not serialized.
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_fixFlags">
+            <summary>
+            The fix state for this event
+            </summary>
+            <remarks>
+            These flags indicate which fields have been fixed.
+            Not serialized.
+            </remarks>
+        </member>
+        <member name="F:log4net.Core.LoggingEvent.m_cacheUpdatable">
+            <summary>
+            Indicated that the internal cache is updateable (ie not fixed)
+            </summary>
+            <remarks>
+            This is a seperate flag to m_fixFlags as it allows incrementel fixing and simpler
+            changes in the caching strategy.
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.StartTime">
+            <summary>
+            Gets the time when the current process started.
+            </summary>
+            <value>
+            This is the time when this process started.
+            </value>
+            <remarks>
+            <para>
+            The TimeStamp is stored internally in UTC and converted to the local time zone for this computer.
+            </para>
+            <para>
+            Tries to get the start time for the current process.
+            Failing that it returns the time of the first call to
+            this property.
+            </para>
+            <para>
+            Note that AppDomains may be loaded and unloaded within the
+            same process without the process terminating and therefore
+            without the process start time being reset.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.StartTimeUtc">
+            <summary>
+            Gets the UTC time when the current process started.
+            </summary>
+            <value>
+            This is the UTC time when this process started.
+            </value>
+            <remarks>
+            <para>
+            Tries to get the start time for the current process.
+            Failing that it returns the time of the first call to
+            this property.
+            </para>
+            <para>
+            Note that AppDomains may be loaded and unloaded within the
+            same process without the process terminating and therefore
+            without the process start time being reset.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Level">
+            <summary>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
+            </value>
+            <remarks>
+            <para>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.TimeStamp">
+            <summary>
+            Gets the time of the logging event.
+            </summary>
+            <value>
+            The time of the logging event.
+            </value>
+            <remarks>
+            <para>
+            The TimeStamp is stored in UTC and converted to the local time zone for this computer.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.TimeStampUtc">
+            <summary>
+            Gets UTC the time of the logging event.
+            </summary>
+            <value>
+            The UTC time of the logging event.
+            </value>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.LoggerName">
+            <summary>
+            Gets the name of the logger that logged the event.
+            </summary>
+            <value>
+            The name of the logger that logged the event.
+            </value>
+            <remarks>
+            <para>
+            Gets the name of the logger that logged the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.LocationInformation">
+            <summary>
+            Gets the location information for this logging event.
+            </summary>
+            <value>
+            The location information for this logging event.
+            </value>
+            <remarks>
+            <para>
+            The collected information is cached for future use.
+            </para>
+            <para>
+            See the <see cref="T:log4net.Core.LocationInfo"/> class for more information on
+            supported frameworks and the different behavior in Debug and
+            Release builds.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.MessageObject">
+            <summary>
+            Gets the message object used to initialize this event.
+            </summary>
+            <value>
+            The message object used to initialize this event.
+            </value>
+            <remarks>
+            <para>
+            Gets the message object used to initialize this event.
+            Note that this event may not have a valid message object.
+            If the event is serialized the message object will not 
+            be transferred. To get the text of the message the
+            <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property must be used 
+            not this property.
+            </para>
+            <para>
+            If there is no defined message object for this event then
+            null will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.ExceptionObject">
+            <summary>
+            Gets the exception object used to initialize this event.
+            </summary>
+            <value>
+            The exception object used to initialize this event.
+            </value>
+            <remarks>
+            <para>
+            Gets the exception object used to initialize this event.
+            Note that this event may not have a valid exception object.
+            If the event is serialized the exception object will not 
+            be transferred. To get the text of the exception the
+            <see cref="M:log4net.Core.LoggingEvent.GetExceptionString"/> method must be used 
+            not this property.
+            </para>
+            <para>
+            If there is no defined exception object for this event then
+            null will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Repository">
+            <summary>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this event was created in.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this event was created in.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.RenderedMessage">
+            <summary>
+            Gets the message, rendered through the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </summary>
+            <value>
+            The message rendered through the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
+            </value>
+            <remarks>
+            <para>
+            The collected information is cached for future use.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.ThreadName">
+            <summary>
+            Gets the name of the current thread.  
+            </summary>
+            <value>
+            The name of the current thread, or the thread ID when 
+            the name is not available.
+            </value>
+            <remarks>
+            <para>
+            The collected information is cached for future use.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.UserName">
+            <summary>
+            Gets the name of the current user.
+            </summary>
+            <value>
+            The name of the current user, or <c>NOT AVAILABLE</c> when the 
+            underlying runtime has no support for retrieving the name of the 
+            current user.
+            </value>
+            <remarks>
+            <para>
+            Calls <c>WindowsIdentity.GetCurrent().Name</c> to get the name of
+            the current windows user.
+            </para>
+            <para>
+            To improve performance, we could cache the string representation of 
+            the name, and reuse that as long as the identity stayed constant.  
+            Once the identity changed, we would need to re-assign and re-render 
+            the string.
+            </para>
+            <para>
+            However, the <c>WindowsIdentity.GetCurrent()</c> call seems to 
+            return different objects every time, so the current implementation 
+            doesn't do this type of caching.
+            </para>
+            <para>
+            Timing for these operations:
+            </para>
+            <list type="table">
+              <listheader>
+                <term>Method</term>
+                <description>Results</description>
+              </listheader>
+              <item>
+                <term><c>WindowsIdentity.GetCurrent()</c></term>
+                <description>10000 loops, 00:00:00.2031250 seconds</description>
+              </item>
+              <item>
+                <term><c>WindowsIdentity.GetCurrent().Name</c></term>
+                <description>10000 loops, 00:00:08.0468750 seconds</description>
+              </item>
+            </list>
+            <para>
+            This means we could speed things up almost 40 times by caching the 
+            value of the <c>WindowsIdentity.GetCurrent().Name</c> property, since 
+            this takes (8.04-0.20) = 7.84375 seconds.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Identity">
+            <summary>
+            Gets the identity of the current thread principal.
+            </summary>
+            <value>
+            The string name of the identity of the current thread principal.
+            </value>
+            <remarks>
+            <para>
+            Calls <c>System.Threading.Thread.CurrentPrincipal.Identity.Name</c> to get
+            the name of the current thread principal.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Domain">
+            <summary>
+            Gets the AppDomain friendly name.
+            </summary>
+            <value>
+            The AppDomain friendly name.
+            </value>
+            <remarks>
+            <para>
+            Gets the AppDomain friendly name.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Properties">
+            <summary>
+            Additional event specific properties.
+            </summary>
+            <value>
+            Additional event specific properties.
+            </value>
+            <remarks>
+            <para>
+            A logger or an appender may attach additional
+            properties to specific events. These properties
+            have a string key and an object value.
+            </para>
+            <para>
+            This property is for events that have been added directly to
+            this event. The aggregate properties (which include these
+            event properties) can be retrieved using <see cref="M:log4net.Core.LoggingEvent.LookupProperty(System.String)"/>
+            and <see cref="M:log4net.Core.LoggingEvent.GetProperties"/>.
+            </para>
+            <para>
+            Once the properties have been fixed <see cref="P:log4net.Core.LoggingEvent.Fix"/> this property
+            returns the combined cached properties. This ensures that updates to
+            this property are always reflected in the underlying storage. When
+            returning the combined properties there may be more keys in the
+            Dictionary than expected.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LoggingEvent.Fix">
+            <summary>
+            The fixed fields in this event
+            </summary>
+            <value>
+            The set of fields that are fixed in this event
+            </value>
+            <remarks>
+            <para>
+            Fields will not be fixed if they have previously been fixed.
+            It is not possible to 'unfix' a field.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.LogImpl">
+            <summary>
+            Implementation of <see cref="T:log4net.ILog"/> wrapper interface.
+            </summary>
+            <remarks>
+            <para>
+            This implementation of the <see cref="T:log4net.ILog"/> interface
+            forwards to the <see cref="T:log4net.Core.ILogger"/> held by the base class.
+            </para>
+            <para>
+            This logger has methods to allow the caller to log at the following
+            levels:
+            </para>
+            <list type="definition">
+              <item>
+                <term>DEBUG</term>
+                <description>
+                The <see cref="M:Debug(object)"/> and <see cref="M:DebugFormat(string, object[])"/> methods log messages
+                at the <c>DEBUG</c> level. That is the level with that name defined in the
+                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
+                for this level is <see cref="F:log4net.Core.Level.Debug"/>. The <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/>
+                property tests if this level is enabled for logging.
+                </description>
+              </item>
+              <item>
+                <term>INFO</term>
+                <description>
+                The <see cref="M:Info(object)"/> and <see cref="M:InfoFormat(string, object[])"/> methods log messages
+                at the <c>INFO</c> level. That is the level with that name defined in the
+                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
+                for this level is <see cref="F:log4net.Core.Level.Info"/>. The <see cref="P:log4net.Core.LogImpl.IsInfoEnabled"/>
+                property tests if this level is enabled for logging.
+                </description>
+              </item>
+              <item>
+                <term>WARN</term>
+                <description>
+                The <see cref="M:Warn(object)"/> and <see cref="M:WarnFormat(string, object[])"/> methods log messages
+                at the <c>WARN</c> level. That is the level with that name defined in the
+                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
+                for this level is <see cref="F:log4net.Core.Level.Warn"/>. The <see cref="P:log4net.Core.LogImpl.IsWarnEnabled"/>
+                property tests if this level is enabled for logging.
+                </description>
+              </item>
+              <item>
+                <term>ERROR</term>
+                <description>
+                The <see cref="M:Error(object)"/> and <see cref="M:ErrorFormat(string, object[])"/> methods log messages
+                at the <c>ERROR</c> level. That is the level with that name defined in the
+                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
+                for this level is <see cref="F:log4net.Core.Level.Error"/>. The <see cref="P:log4net.Core.LogImpl.IsErrorEnabled"/>
+                property tests if this level is enabled for logging.
+                </description>
+              </item>
+              <item>
+                <term>FATAL</term>
+                <description>
+                The <see cref="M:Fatal(object)"/> and <see cref="M:FatalFormat(string, object[])"/> methods log messages
+                at the <c>FATAL</c> level. That is the level with that name defined in the
+                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
+                for this level is <see cref="F:log4net.Core.Level.Fatal"/>. The <see cref="P:log4net.Core.LogImpl.IsFatalEnabled"/>
+                property tests if this level is enabled for logging.
+                </description>
+              </item>
+            </list>
+            <para>
+            The values for these levels and their semantic meanings can be changed by 
+            configuring the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/> for the repository.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.ILog">
+            <summary>
+            The ILog interface is use by application to log messages into
+            the log4net framework.
+            </summary>
+            <remarks>
+            <para>
+            Use the <see cref="T:log4net.LogManager"/> to obtain logger instances
+            that implement this interface. The <see cref="M:LogManager.GetLogger(Assembly,Type)"/>
+            static method is used to get logger instances.
+            </para>
+            <para>
+            This class contains methods for logging at different levels and also
+            has properties for determining if those logging levels are
+            enabled in the current configuration.
+            </para>
+            <para>
+            This interface can be implemented in different ways. This documentation
+            specifies reasonable behavior that a caller can expect from the actual
+            implementation, however different implementations reserve the right to
+            do things differently.
+            </para>
+            </remarks>
+            <example>Simple example of logging messages
+            <code lang="C#">
+            ILog log = LogManager.GetLogger("application-log");
+            
+            log.Info("Application Start");
+            log.Debug("This is a debug message");
+            
+            if (log.IsDebugEnabled)
+            {
+            	log.Debug("This is another debug message");
+            }
+            </code>
+            </example>
+            <seealso cref="T:log4net.LogManager"/>
+            <seealso cref="M:LogManager.GetLogger(Assembly, Type)"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.ILog.Debug(System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.</overloads>
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>DEBUG</c>
+            enabled by comparing the level of this logger with the 
+            <see cref="F:log4net.Core.Level.Debug"/> level. If this logger is
+            <c>DEBUG</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Debug(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Debug(System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:Debug(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object[])">
+            <overloads>Log a formatted string with the <see cref="F:log4net.Core.Level.Debug"/> level.</overloads>
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.DebugFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Info(System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level.</overloads>
+            <summary>
+            Logs a message object with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by comparing the level of this logger with the 
+            <see cref="F:log4net.Core.Level.Info"/> level. If this logger is
+            <c>INFO</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Info(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+            <param name="message">The message object to log.</param>
+            <seealso cref="M:Info(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Info(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>INFO</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:Info(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object[])">
+            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.</overloads>
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.InfoFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Warn(System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.</overloads>
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>WARN</c>
+            enabled by comparing the level of this logger with the 
+            <see cref="F:log4net.Core.Level.Warn"/> level. If this logger is
+            <c>WARN</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Warn(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+            <param name="message">The message object to log.</param>
+            <seealso cref="M:Warn(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Warn(System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:Warn(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object[])">
+            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.</overloads>
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.WarnFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Error(System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level.</overloads>
+            <summary>
+            Logs a message object with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>ERROR</c>
+            enabled by comparing the level of this logger with the 
+            <see cref="F:log4net.Core.Level.Error"/> level. If this logger is
+            <c>ERROR</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Error(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Error(System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:Error(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object[])">
+            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.</overloads>
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.ErrorFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Fatal(System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.</overloads>
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>FATAL</c>
+            enabled by comparing the level of this logger with the 
+            <see cref="F:log4net.Core.Level.Fatal"/> level. If this logger is
+            <c>FATAL</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Fatal(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+            <param name="message">The message object to log.</param>
+            <seealso cref="M:Fatal(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.Fatal(System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:Fatal(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object[])">
+            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.</overloads>
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object,Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.ILog.FatalFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:String.Format(string, object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object,Exception)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="P:log4net.ILog.IsDebugEnabled">
+            <summary>
+            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Debug"/> events, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            This function is intended to lessen the computational cost of
+            disabled log debug statements.
+            </para>
+            <para> For some ILog interface <c>log</c>, when you write:</para>
+            <code lang="C#">
+            log.Debug("This is entry number: " + i );
+            </code>
+            <para>
+            You incur the cost constructing the message, string construction and concatenation in
+            this case, regardless of whether the message is logged or not.
+            </para>
+            <para>
+            If you are worried about speed (who isn't), then you should write:
+            </para>
+            <code lang="C#">
+            if (log.IsDebugEnabled)
+            { 
+                log.Debug("This is entry number: " + i );
+            }
+            </code>
+            <para>
+            This way you will not incur the cost of parameter
+            construction if debugging is disabled for <c>log</c>. On
+            the other hand, if the <c>log</c> is debug enabled, you
+            will incur the cost of evaluating whether the logger is debug
+            enabled twice. Once in <see cref="P:log4net.ILog.IsDebugEnabled"/> and once in
+            the <see cref="M:Debug(object)"/>.  This is an insignificant overhead
+            since evaluating a logger takes about 1% of the time it
+            takes to actually log. This is the preferred style of logging.
+            </para>
+            <para>Alternatively if your logger is available statically then the is debug
+            enabled state can be stored in a static variable like this:
+            </para>
+            <code lang="C#">
+            private static readonly bool isDebugEnabled = log.IsDebugEnabled;
+            </code>
+            <para>
+            Then when you come to log you can write:
+            </para>
+            <code lang="C#">
+            if (isDebugEnabled)
+            { 
+                log.Debug("This is entry number: " + i );
+            }
+            </code>
+            <para>
+            This way the debug enabled state is only queried once
+            when the class is loaded. Using a <c>private static readonly</c>
+            variable is the most efficient because it is a run time constant
+            and can be heavily optimized by the JIT compiler.
+            </para>
+            <para>
+            Of course if you use a static readonly variable to
+            hold the enabled state of the logger then you cannot
+            change the enabled state at runtime to vary the logging
+            that is produced. You have to decide if you need absolute
+            speed or runtime flexibility.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+            <seealso cref="M:DebugFormat(IFormatProvider, string, object[])"/>
+        </member>
+        <member name="P:log4net.ILog.IsInfoEnabled">
+            <summary>
+            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Info"/> events, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+            <seealso cref="M:InfoFormat(IFormatProvider, string, object[])"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.ILog.IsWarnEnabled">
+            <summary>
+            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Warn"/> events, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+            <seealso cref="M:WarnFormat(IFormatProvider, string, object[])"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.ILog.IsErrorEnabled">
+            <summary>
+            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Error"/> events, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+            <seealso cref="M:ErrorFormat(IFormatProvider, string, object[])"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.ILog.IsFatalEnabled">
+            <summary>
+            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Fatal"/> events, <c>false</c> otherwise.
+            </value>
+            <remarks>
+            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+            <seealso cref="M:FatalFormat(IFormatProvider, string, object[])"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.#ctor(log4net.Core.ILogger)">
+            <summary>
+            Construct a new wrapper for the specified logger.
+            </summary>
+            <param name="logger">The logger to wrap.</param>
+            <remarks>
+            <para>
+            Construct a new wrapper for the specified logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ReloadLevels(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Virtual method called when the configuration of the repository changes
+            </summary>
+            <param name="repository">the repository holding the levels</param>
+            <remarks>
+            <para>
+            Virtual method called when the configuration of the repository changes
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Debug(System.Object)">
+            <summary>
+            Logs a message object with the <c>DEBUG</c> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>DEBUG</c>
+            enabled by comparing the level of this logger with the 
+            <c>DEBUG</c> level. If this logger is
+            <c>DEBUG</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para>
+            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Debug(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Debug(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>DEBUG</c> level
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Logs a message object with the <c>DEBUG</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> passed
+            as a parameter.
+            </para>
+            <para>
+            See the <see cref="M:Debug(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Debug(object)"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>DEBUG</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:DebugFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>DEBUG</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:DebugFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>DEBUG</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:DebugFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>DEBUG</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:DebugFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>DEBUG</c> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Debug(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Info(System.Object)">
+            <summary>
+            Logs a message object with the <c>INFO</c> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by comparing the level of this logger with the 
+            <c>INFO</c> level. If this logger is
+            <c>INFO</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para>
+            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:Info(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Info(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>INFO</c> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Logs a message object with the <c>INFO</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
+            passed as a parameter.
+            </para>
+            <para>
+            See the <see cref="M:Info(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Info(object)"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>INFO</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:InfoFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>INFO</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:InfoFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>INFO</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:InfoFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>INFO</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:InfoFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>INFO</c> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Info(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Warn(System.Object)">
+            <summary>
+            Logs a message object with the <c>WARN</c> level.
+            </summary>
+            <param name="message">the message object to log</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>WARN</c>
+            enabled by comparing the level of this logger with the 
+            <c>WARN</c> level. If this logger is
+            <c>WARN</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger and 
+            also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para>
+            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
+            method will print the name of the <see cref="T:System.Exception"/> but no
+            stack trace. To print a stack trace use the 
+            <see cref="M:Warn(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Warn(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>WARN</c> level
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Logs a message object with the <c>WARN</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
+            passed as a parameter.
+            </para>
+            <para>
+            See the <see cref="M:Warn(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Warn(object)"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>WARN</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:WarnFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>WARN</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:WarnFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>WARN</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:WarnFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>WARN</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:WarnFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>WARN</c> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Warn(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Error(System.Object)">
+            <summary>
+            Logs a message object with the <c>ERROR</c> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>ERROR</c>
+            enabled by comparing the level of this logger with the 
+            <c>ERROR</c> level. If this logger is
+            <c>ERROR</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger and 
+            also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para>
+            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
+            method will print the name of the <see cref="T:System.Exception"/> but no
+            stack trace. To print a stack trace use the 
+            <see cref="M:Error(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Error(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>ERROR</c> level
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Logs a message object with the <c>ERROR</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
+            passed as a parameter.
+            </para>
+            <para>
+            See the <see cref="M:Error(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Error(object)"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>ERROR</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:ErrorFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>ERROR</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:ErrorFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>ERROR</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:ErrorFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>ERROR</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:ErrorFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>ERROR</c> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Error(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Fatal(System.Object)">
+            <summary>
+            Logs a message object with the <c>FATAL</c> level.
+            </summary>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>FATAL</c>
+            enabled by comparing the level of this logger with the 
+            <c>FATAL</c> level. If this logger is
+            <c>FATAL</c> enabled, then it converts the message object
+            (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger and 
+            also higher in the hierarchy depending on the value of the 
+            additivity flag.
+            </para>
+            <para>
+            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
+            method will print the name of the <see cref="T:System.Exception"/> but no
+            stack trace. To print a stack trace use the 
+            <see cref="M:Fatal(object,Exception)"/> form instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.Fatal(System.Object,System.Exception)">
+            <summary>
+            Logs a message object with the <c>FATAL</c> level
+            </summary>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Logs a message object with the <c>FATAL</c> level including
+            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
+            passed as a parameter.
+            </para>
+            <para>
+            See the <see cref="M:Fatal(object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:Fatal(object)"/>
+        </member>
+        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>FATAL</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:FatalFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>FATAL</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:FatalFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>FATAL</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:FatalFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <c>FATAL</c> level.
+            </summary>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
+            format provider. To specify a localized provider use the
+            <see cref="M:FatalFormat(IFormatProvider,string,object[])"/> method.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <c>FATAL</c> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <see cref="M:String.Format(IFormatProvider, string, object[])"/> method. See
+            <c>String.Format</c> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:Fatal(object)"/>
+            methods instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.LogImpl.LoggerRepositoryConfigurationChanged(System.Object,System.EventArgs)">
+            <summary>
+            Event handler for the <see cref="E:log4net.Repository.ILoggerRepository.ConfigurationChanged"/> event
+            </summary>
+            <param name="sender">the repository</param>
+            <param name="e">Empty</param>
+        </member>
+        <member name="F:log4net.Core.LogImpl.ThisDeclaringType">
+            <summary>
+            The fully qualified name of this declaring type not the type of any subclass.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.LogImpl.IsDebugEnabled">
+            <summary>
+            Checks if this logger is enabled for the <c>DEBUG</c>
+            level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <c>DEBUG</c> events,
+            <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            This function is intended to lessen the computational cost of
+            disabled log debug statements.
+            </para>
+            <para>
+            For some <c>log</c> Logger object, when you write:
+            </para>
+            <code lang="C#">
+            log.Debug("This is entry number: " + i );
+            </code>
+            <para>
+            You incur the cost constructing the message, concatenation in
+            this case, regardless of whether the message is logged or not.
+            </para>
+            <para>
+            If you are worried about speed, then you should write:
+            </para>
+            <code lang="C#">
+            if (log.IsDebugEnabled())
+            { 
+             log.Debug("This is entry number: " + i );
+            }
+            </code>
+            <para>
+            This way you will not incur the cost of parameter
+            construction if debugging is disabled for <c>log</c>. On
+            the other hand, if the <c>log</c> is debug enabled, you
+            will incur the cost of evaluating whether the logger is debug
+            enabled twice. Once in <c>IsDebugEnabled</c> and once in
+            the <c>Debug</c>.  This is an insignificant overhead
+            since evaluating a logger takes about 1% of the time it
+            takes to actually log.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.LogImpl.IsInfoEnabled">
+            <summary>
+            Checks if this logger is enabled for the <c>INFO</c> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <c>INFO</c> events,
+            <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples 
+            of using this method.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.Core.LogImpl.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.Core.LogImpl.IsWarnEnabled">
+            <summary>
+            Checks if this logger is enabled for the <c>WARN</c> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <c>WARN</c> events,
+            <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples 
+            of using this method.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.Core.LogImpl.IsErrorEnabled">
+            <summary>
+            Checks if this logger is enabled for the <c>ERROR</c> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <c>ERROR</c> events,
+            <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples of using this method.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="P:log4net.Core.LogImpl.IsFatalEnabled">
+            <summary>
+            Checks if this logger is enabled for the <c>FATAL</c> level.
+            </summary>
+            <value>
+            <c>true</c> if this logger is enabled for <c>FATAL</c> events,
+            <c>false</c> otherwise.
+            </value>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples of using this method.
+            </para>
+            </remarks>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="T:log4net.Core.MethodItem">
+            <summary>
+            provides method information without actually referencing a System.Reflection.MethodBase
+            as that would require that the containing assembly is loaded.
+            </summary>
+            
+        </member>
+        <member name="F:log4net.Core.MethodItem.NA">
+            <summary>
+            When location information is not available the constant
+            <c>NA</c> is returned. Current value of this string
+            constant is <b>?</b>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.MethodItem.#ctor">
+            <summary>
+            constructs a method item for an unknown method.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.MethodItem.#ctor(System.String)">
+            <summary>
+            constructs a method item from the name of the method.
+            </summary>
+            <param name="name"></param>
+        </member>
+        <member name="M:log4net.Core.MethodItem.#ctor(System.String,System.String[])">
+            <summary>
+            constructs a method item from the name of the method and its parameters.
+            </summary>
+            <param name="name"></param>
+            <param name="parameters"></param>
+        </member>
+        <member name="M:log4net.Core.MethodItem.#ctor(System.Reflection.MethodBase)">
+            <summary>
+            constructs a method item from a method base by determining the method name and its parameters.
+            </summary>
+            <param name="methodBase"></param>
+        </member>
+        <member name="F:log4net.Core.MethodItem.declaringType">
+            <summary>
+            The fully qualified type of the StackFrameItem class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.MethodItem.Name">
+            <summary>
+            Gets the method name of the caller making the logging 
+            request.
+            </summary>
+            <value>
+            The method name of the caller making the logging 
+            request.
+            </value>
+            <remarks>
+            <para>
+            Gets the method name of the caller making the logging 
+            request.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.MethodItem.Parameters">
+            <summary>
+            Gets the method parameters of the caller making
+            the logging request.
+            </summary>
+            <value>
+            The method parameters of the caller making
+            the logging request
+            </value>
+            <remarks>
+            <para>
+            Gets the method parameters of the caller making
+            the logging request.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.SecurityContext">
+            <summary>
+            A SecurityContext used by log4net when interacting with protected resources
+            </summary>
+            <remarks>
+            <para>
+            A SecurityContext used by log4net when interacting with protected resources
+            for example with operating system services. This can be used to impersonate
+            a principal that has been granted privileges on the system resources.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Core.SecurityContext.Impersonate(System.Object)">
+            <summary>
+            Impersonate this SecurityContext
+            </summary>
+            <param name="state">State supplied by the caller</param>
+            <returns>An <see cref="T:System.IDisposable"/> instance that will
+            revoke the impersonation of this SecurityContext, or <c>null</c></returns>
+            <remarks>
+            <para>
+            Impersonate this security context. Further calls on the current
+            thread should now be made in the security context provided
+            by this object. When the <see cref="T:System.IDisposable"/> result 
+            <see cref="M:System.IDisposable.Dispose"/> method is called the security
+            context of the thread should be reverted to the state it was in
+            before <see cref="M:log4net.Core.SecurityContext.Impersonate(System.Object)"/> was called.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.SecurityContextProvider">
+            <summary>
+            The <see cref="T:log4net.Core.SecurityContextProvider"/> providers default <see cref="T:log4net.Core.SecurityContext"/> instances.
+            </summary>
+            <remarks>
+            <para>
+            A configured component that interacts with potentially protected system
+            resources uses a <see cref="T:log4net.Core.SecurityContext"/> to provide the elevated
+            privileges required. If the <see cref="T:log4net.Core.SecurityContext"/> object has
+            been not been explicitly provided to the component then the component
+            will request one from this <see cref="T:log4net.Core.SecurityContextProvider"/>.
+            </para>
+            <para>
+            By default the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is
+            an instance of <see cref="T:log4net.Core.SecurityContextProvider"/> which returns only
+            <see cref="T:log4net.Util.NullSecurityContext"/> objects. This is a reasonable default
+            where the privileges required are not know by the system.
+            </para>
+            <para>
+            This default behavior can be overridden by subclassing the <see cref="T:log4net.Core.SecurityContextProvider"/>
+            and overriding the <see cref="M:log4net.Core.SecurityContextProvider.CreateSecurityContext(System.Object)"/> method to return
+            the desired <see cref="T:log4net.Core.SecurityContext"/> objects. The default provider
+            can be replaced by programmatically setting the value of the 
+            <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> property.
+            </para>
+            <para>
+            An alternative is to use the <c>log4net.Config.SecurityContextProviderAttribute</c>
+            This attribute can be applied to an assembly in the same way as the
+            <c>log4net.Config.XmlConfiguratorAttribute"</c>. The attribute takes
+            the type to use as the <see cref="T:log4net.Core.SecurityContextProvider"/> as an argument.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Core.SecurityContextProvider.s_defaultProvider">
+            <summary>
+            The default provider
+            </summary>
+        </member>
+        <member name="M:log4net.Core.SecurityContextProvider.#ctor">
+            <summary>
+            Protected default constructor to allow subclassing
+            </summary>
+            <remarks>
+            <para>
+            Protected default constructor to allow subclassing
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.SecurityContextProvider.CreateSecurityContext(System.Object)">
+            <summary>
+            Create a SecurityContext for a consumer
+            </summary>
+            <param name="consumer">The consumer requesting the SecurityContext</param>
+            <returns>An impersonation context</returns>
+            <remarks>
+            <para>
+            The default implementation is to return a <see cref="T:log4net.Util.NullSecurityContext"/>.
+            </para>
+            <para>
+            Subclasses should override this method to provide their own
+            behavior.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.SecurityContextProvider.DefaultProvider">
+            <summary>
+            Gets or sets the default SecurityContextProvider
+            </summary>
+            <value>
+            The default SecurityContextProvider
+            </value>
+            <remarks>
+            <para>
+            The default provider is used by configured components that
+            require a <see cref="T:log4net.Core.SecurityContext"/> and have not had one
+            given to them.
+            </para>
+            <para>
+            By default this is an instance of <see cref="T:log4net.Core.SecurityContextProvider"/>
+            that returns <see cref="T:log4net.Util.NullSecurityContext"/> objects.
+            </para>
+            <para>
+            The default provider can be set programmatically by setting
+            the value of this property to a sub class of <see cref="T:log4net.Core.SecurityContextProvider"/>
+            that has the desired behavior.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.StackFrameItem">
+            <summary>
+            provides stack frame information without actually referencing a System.Diagnostics.StackFrame
+            as that would require that the containing assembly is loaded.
+            </summary>
+            
+        </member>
+        <member name="F:log4net.Core.StackFrameItem.NA">
+            <summary>
+            When location information is not available the constant
+            <c>NA</c> is returned. Current value of this string
+            constant is <b>?</b>.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.StackFrameItem.#ctor(System.Diagnostics.StackFrame)">
+            <summary>
+            returns a stack frame item from a stack frame. This 
+            </summary>
+            <param name="frame"></param>
+            <returns></returns>
+        </member>
+        <member name="F:log4net.Core.StackFrameItem.declaringType">
+            <summary>
+            The fully qualified type of the StackFrameItem class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.StackFrameItem.ClassName">
+            <summary>
+            Gets the fully qualified class name of the caller making the logging 
+            request.
+            </summary>
+            <value>
+            The fully qualified class name of the caller making the logging 
+            request.
+            </value>
+            <remarks>
+            <para>
+            Gets the fully qualified class name of the caller making the logging 
+            request.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.StackFrameItem.FileName">
+            <summary>
+            Gets the file name of the caller.
+            </summary>
+            <value>
+            The file name of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the file name of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.StackFrameItem.LineNumber">
+            <summary>
+            Gets the line number of the caller.
+            </summary>
+            <value>
+            The line number of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the line number of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.StackFrameItem.Method">
+            <summary>
+            Gets the method name of the caller.
+            </summary>
+            <value>
+            The method name of the caller.
+            </value>
+            <remarks>
+            <para>
+            Gets the method name of the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.StackFrameItem.FullInfo">
+            <summary>
+            Gets all available caller information
+            </summary>
+            <value>
+            All available caller information, in the format
+            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
+            </value>
+            <remarks>
+            <para>
+            Gets all available caller information, in the format
+            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.TimeEvaluator">
+            <summary>
+            An evaluator that triggers after specified number of seconds.
+            </summary>
+            <remarks>
+            <para>
+            This evaluator will trigger if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.
+            </para>
+            </remarks>
+            <author>Robert Sevcik</author>
+        </member>
+        <member name="F:log4net.Core.TimeEvaluator.DEFAULT_INTERVAL">
+            <summary>
+            The default time threshold for triggering in seconds. Zero means it won't trigger at all.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.TimeEvaluator.m_interval">
+            <summary>
+            The time threshold for triggering in seconds. Zero means it won't trigger at all.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.TimeEvaluator.m_lastTimeUtc">
+            <summary>
+            The UTC time of last check. This gets updated when the object is created and when the evaluator triggers.
+            </summary>
+        </member>
+        <member name="M:log4net.Core.TimeEvaluator.#ctor">
+            <summary>
+            Create a new evaluator using the <see cref="F:log4net.Core.TimeEvaluator.DEFAULT_INTERVAL"/> time threshold in seconds.
+            </summary>
+            <remarks>
+            <para>
+            Create a new evaluator using the <see cref="F:log4net.Core.TimeEvaluator.DEFAULT_INTERVAL"/> time threshold in seconds.
+            </para>
+            <para>
+            This evaluator will trigger if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.TimeEvaluator.#ctor(System.Int32)">
+            <summary>
+            Create a new evaluator using the specified time threshold in seconds.
+            </summary>
+            <param name="interval">
+            The time threshold in seconds to trigger after.
+            Zero means it won't trigger at all.
+            </param>
+            <remarks>
+            <para>
+            Create a new evaluator using the specified time threshold in seconds.
+            </para>
+            <para>
+            This evaluator will trigger if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.TimeEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
+            <summary>
+            Is this <paramref name="loggingEvent"/> the triggering event?
+            </summary>
+            <param name="loggingEvent">The event to check</param>
+            <returns>This method returns <c>true</c>, if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.. 
+            Otherwise it returns <c>false</c></returns>
+            <remarks>
+            <para>
+            This evaluator will trigger if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Core.TimeEvaluator.Interval">
+            <summary>
+            The time threshold in seconds to trigger after
+            </summary>
+            <value>
+            The time threshold in seconds to trigger after.
+            Zero means it won't trigger at all.
+            </value>
+            <remarks>
+            <para>
+            This evaluator will trigger if the specified time period 
+            <see cref="P:log4net.Core.TimeEvaluator.Interval"/> has passed since last check.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.WrapperCreationHandler">
+            <summary>
+            Delegate used to handle creation of new wrappers.
+            </summary>
+            <param name="logger">The logger to wrap in a wrapper.</param>
+            <remarks>
+            <para>
+            Delegate used to handle creation of new wrappers. This delegate
+            is called from the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/>
+            method to construct the wrapper for the specified logger.
+            </para>
+            <para>
+            The delegate to use is supplied to the <see cref="T:log4net.Core.WrapperMap"/>
+            constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Core.WrapperMap">
+            <summary>
+            Maps between logger objects and wrapper objects.
+            </summary>
+            <remarks>
+            <para>
+            This class maintains a mapping between <see cref="T:log4net.Core.ILogger"/> objects and
+            <see cref="T:log4net.Core.ILoggerWrapper"/> objects. Use the <see cref="M:log4net.Core.WrapperMap.GetWrapper(log4net.Core.ILogger)"/> method to 
+            lookup the <see cref="T:log4net.Core.ILoggerWrapper"/> for the specified <see cref="T:log4net.Core.ILogger"/>.
+            </para>
+            <para>
+            New wrapper instances are created by the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/>
+            method. The default behavior is for this method to delegate construction
+            of the wrapper to the <see cref="T:log4net.Core.WrapperCreationHandler"/> delegate supplied
+            to the constructor. This allows specialization of the behavior without
+            requiring subclassing of this type.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Core.WrapperMap.#ctor(log4net.Core.WrapperCreationHandler)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Core.WrapperMap"/>
+            </summary>
+            <param name="createWrapperHandler">The handler to use to create the wrapper objects.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Core.WrapperMap"/> class with 
+            the specified handler to create the wrapper objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.WrapperMap.GetWrapper(log4net.Core.ILogger)">
+            <summary>
+            Gets the wrapper object for the specified logger.
+            </summary>
+            <returns>The wrapper object for the specified logger</returns>
+            <remarks>
+            <para>
+            If the logger is null then the corresponding wrapper is null.
+            </para>
+            <para>
+            Looks up the wrapper it it has previously been requested and
+            returns it. If the wrapper has never been requested before then
+            the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/> virtual method is
+            called.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)">
+            <summary>
+            Creates the wrapper object for the specified logger.
+            </summary>
+            <param name="logger">The logger to wrap in a wrapper.</param>
+            <returns>The wrapper object for the logger.</returns>
+            <remarks>
+            <para>
+            This implementation uses the <see cref="T:log4net.Core.WrapperCreationHandler"/>
+            passed to the constructor to create the wrapper. This method
+            can be overridden in a subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.WrapperMap.RepositoryShutdown(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Called when a monitored repository shutdown event is received.
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that is shutting down</param>
+            <remarks>
+            <para>
+            This method is called when a <see cref="T:log4net.Repository.ILoggerRepository"/> that this
+            <see cref="T:log4net.Core.WrapperMap"/> is holding loggers for has signaled its shutdown
+            event <see cref="E:log4net.Repository.ILoggerRepository.ShutdownEvent"/>. The default
+            behavior of this method is to release the references to the loggers
+            and their wrappers generated for this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Core.WrapperMap.ILoggerRepository_Shutdown(System.Object,System.EventArgs)">
+            <summary>
+            Event handler for repository shutdown event.
+            </summary>
+            <param name="sender">The sender of the event.</param>
+            <param name="e">The event args.</param>
+        </member>
+        <member name="F:log4net.Core.WrapperMap.m_repositories">
+            <summary>
+            Map of logger repositories to hashtables of ILogger to ILoggerWrapper mappings
+            </summary>
+        </member>
+        <member name="F:log4net.Core.WrapperMap.m_createWrapperHandler">
+            <summary>
+            The handler to use to create the extension wrapper objects.
+            </summary>
+        </member>
+        <member name="F:log4net.Core.WrapperMap.m_shutdownHandler">
+            <summary>
+            Internal reference to the delegate used to register for repository shutdown events.
+            </summary>
+        </member>
+        <member name="P:log4net.Core.WrapperMap.Repositories">
+            <summary>
+            Gets the map of logger repositories.
+            </summary>
+            <value>
+            Map of logger repositories.
+            </value>
+            <remarks>
+            <para>
+            Gets the hashtable that is keyed on <see cref="T:log4net.Repository.ILoggerRepository"/>. The
+            values are hashtables keyed on <see cref="T:log4net.Core.ILogger"/> with the
+            value being the corresponding <see cref="T:log4net.Core.ILoggerWrapper"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.DateFormatter.AbsoluteTimeDateFormatter">
+            <summary>
+            Formats a <see cref="T:System.DateTime"/> as <c>"HH:mm:ss,fff"</c>.
+            </summary>
+            <remarks>
+            <para>
+            Formats a <see cref="T:System.DateTime"/> in the format <c>"HH:mm:ss,fff"</c> for example, <c>"15:49:37,459"</c>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.DateFormatter.IDateFormatter">
+            <summary>
+            Render a <see cref="T:System.DateTime"/> as a string.
+            </summary>
+            <remarks>
+            <para>
+            Interface to abstract the rendering of a <see cref="T:System.DateTime"/>
+            instance into a string.
+            </para>
+            <para>
+            The <see cref="M:log4net.DateFormatter.IDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)"/> method is used to render the
+            date to a text writer.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.DateFormatter.IDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
+            <summary>
+            Formats the specified date as a string.
+            </summary>
+            <param name="dateToFormat">The date to format.</param>
+            <param name="writer">The writer to write to.</param>
+            <remarks>
+            <para>
+            Format the <see cref="T:System.DateTime"/> as a string and write it
+            to the <see cref="T:System.IO.TextWriter"/> provided.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.AbsoluteTimeDateFormat">
+            <summary>
+            String constant used to specify AbsoluteTimeDateFormat in layouts. Current value is <b>ABSOLUTE</b>.
+            </summary>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.DateAndTimeDateFormat">
+            <summary>
+            String constant used to specify DateTimeDateFormat in layouts.  Current value is <b>DATE</b>.
+            </summary>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.Iso8601TimeDateFormat">
+            <summary>
+            String constant used to specify ISO8601DateFormat in layouts. Current value is <b>ISO8601</b>.
+            </summary>
+        </member>
+        <member name="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
+            <summary>
+            Renders the date into a string. Format is <c>"HH:mm:ss"</c>.
+            </summary>
+            <param name="dateToFormat">The date to render into a string.</param>
+            <param name="buffer">The string builder to write to.</param>
+            <remarks>
+            <para>
+            Subclasses should override this method to render the date
+            into a string using a precision up to the second. This method
+            will be called at most once per second and the result will be
+            reused if it is needed again during the same second.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
+            <summary>
+            Renders the date into a string. Format is "HH:mm:ss,fff".
+            </summary>
+            <param name="dateToFormat">The date to render into a string.</param>
+            <param name="writer">The writer to write to.</param>
+            <remarks>
+            <para>
+            Uses the <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> method to generate the
+            time string up to the seconds and then appends the current
+            milliseconds. The results from <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> are
+            cached and <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> is called at most once
+            per second.
+            </para>
+            <para>
+            Sub classes should override <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/>
+            rather than <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeToTheSecond">
+            <summary>
+            Last stored time with precision up to the second.
+            </summary>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeBuf">
+            <summary>
+            Last stored time with precision up to the second, formatted
+            as a string.
+            </summary>
+        </member>
+        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeStrings">
+            <summary>
+            Last stored time with precision up to the second, formatted
+            as a string.
+            </summary>
+        </member>
+        <member name="T:log4net.DateFormatter.DateTimeDateFormatter">
+            <summary>
+            Formats a <see cref="T:System.DateTime"/> as <c>"dd MMM yyyy HH:mm:ss,fff"</c>
+            </summary>
+            <remarks>
+            <para>
+            Formats a <see cref="T:System.DateTime"/> in the format 
+            <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, 
+            <c>"06 Nov 1994 15:49:37,459"</c>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Angelika Schnagl</author>
+        </member>
+        <member name="M:log4net.DateFormatter.DateTimeDateFormatter.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.DateFormatter.DateTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
+            <summary>
+            Formats the date without the milliseconds part
+            </summary>
+            <param name="dateToFormat">The date to format.</param>
+            <param name="buffer">The string builder to write to.</param>
+            <remarks>
+            <para>
+            Formats a DateTime in the format <c>"dd MMM yyyy HH:mm:ss"</c>
+            for example, <c>"06 Nov 1994 15:49:37"</c>.
+            </para>
+            <para>
+            The base class will append the <c>",fff"</c> milliseconds section.
+            This method will only be called at most once per second.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.DateFormatter.DateTimeDateFormatter.m_dateTimeFormatInfo">
+            <summary>
+            The format info for the invariant culture.
+            </summary>
+        </member>
+        <member name="T:log4net.DateFormatter.Iso8601DateFormatter">
+            <summary>
+            Formats the <see cref="T:System.DateTime"/> as <c>"yyyy-MM-dd HH:mm:ss,fff"</c>.
+            </summary>
+            <remarks>
+            <para>
+            Formats the <see cref="T:System.DateTime"/> specified as a string: <c>"yyyy-MM-dd HH:mm:ss,fff"</c>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.DateFormatter.Iso8601DateFormatter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.DateFormatter.Iso8601DateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
+            <summary>
+            Formats the date without the milliseconds part
+            </summary>
+            <param name="dateToFormat">The date to format.</param>
+            <param name="buffer">The string builder to write to.</param>
+            <remarks>
+            <para>
+            Formats the date specified as a string: <c>"yyyy-MM-dd HH:mm:ss"</c>.
+            </para>
+            <para>
+            The base class will append the <c>",fff"</c> milliseconds section.
+            This method will only be called at most once per second.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.DateFormatter.SimpleDateFormatter">
+            <summary>
+            Formats the <see cref="T:System.DateTime"/> using the <see cref="M:DateTime.ToString(string, IFormatProvider)"/> method.
+            </summary>
+            <remarks>
+            <para>
+            Formats the <see cref="T:System.DateTime"/> using the <see cref="T:System.DateTime"/> <see cref="M:DateTime.ToString(string, IFormatProvider)"/> method.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.DateFormatter.SimpleDateFormatter.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="format">The format string.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> class 
+            with the specified format string.
+            </para>
+            <para>
+            The format string must be compatible with the options
+            that can be supplied to <see cref="M:DateTime.ToString(string, IFormatProvider)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.DateFormatter.SimpleDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
+            <summary>
+            Formats the date using <see cref="M:DateTime.ToString(string, IFormatProvider)"/>.
+            </summary>
+            <param name="dateToFormat">The date to convert to a string.</param>
+            <param name="writer">The writer to write to.</param>
+            <remarks>
+            <para>
+            Uses the date format string supplied to the constructor to call
+            the <see cref="M:DateTime.ToString(string, IFormatProvider)"/> method to format the date.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.DateFormatter.SimpleDateFormatter.m_formatString">
+            <summary>
+            The format string used to format the <see cref="T:System.DateTime"/>.
+            </summary>
+            <remarks>
+            <para>
+            The format string must be compatible with the options
+            that can be supplied to <see cref="M:DateTime.ToString(string, IFormatProvider)"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.DenyAllFilter">
+            <summary>
+            This filter drops all <see cref="T:log4net.Core.LoggingEvent"/>. 
+            </summary>
+            <remarks>
+            <para>
+            You can add this filter to the end of a filter chain to
+            switch from the default "accept all unless instructed otherwise"
+            filtering behavior to a "deny all unless instructed otherwise"
+            behavior.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Filter.FilterSkeleton">
+            <summary>
+            Subclass this type to implement customized logging event filtering
+            </summary>
+            <remarks>
+            <para>
+            Users should extend this class to implement customized logging
+            event filtering. Note that <see cref="T:log4net.Repository.Hierarchy.Logger"/> and 
+            <see cref="T:log4net.Appender.AppenderSkeleton"/>, the parent class of all standard
+            appenders, have built-in filtering rules. It is suggested that you
+            first use and understand the built-in rules before rushing to write
+            your own custom filters.
+            </para>
+            <para>
+            This abstract class assumes and also imposes that filters be
+            organized in a linear chain. The <see cref="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)"/>
+            method of each filter is called sequentially, in the order of their 
+            addition to the chain.
+            </para>
+            <para>
+            The <see cref="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)"/> method must return one
+            of the integer constants <see cref="F:log4net.Filter.FilterDecision.Deny"/>, 
+            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> or <see cref="F:log4net.Filter.FilterDecision.Accept"/>.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned, then the log event is dropped 
+            immediately without consulting with the remaining filters.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned, then the next filter
+            in the chain is consulted. If there are no more filters in the
+            chain, then the log event is logged. Thus, in the presence of no
+            filters, the default behavior is to log all logging events.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, then the log
+            event is logged without consulting the remaining filters.
+            </para>
+            <para>
+            The philosophy of log4net filters is largely inspired from the
+            Linux ipchains.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Filter.IFilter">
+            <summary>
+            Implement this interface to provide customized logging event filtering
+            </summary>
+            <remarks>
+            <para>
+            Users should implement this interface to implement customized logging
+            event filtering. Note that <see cref="T:log4net.Repository.Hierarchy.Logger"/> and 
+            <see cref="T:log4net.Appender.AppenderSkeleton"/>, the parent class of all standard
+            appenders, have built-in filtering rules. It is suggested that you
+            first use and understand the built-in rules before rushing to write
+            your own custom filters.
+            </para>
+            <para>
+            This abstract class assumes and also imposes that filters be
+            organized in a linear chain. The <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
+            method of each filter is called sequentially, in the order of their 
+            addition to the chain.
+            </para>
+            <para>
+            The <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/> method must return one
+            of the integer constants <see cref="F:log4net.Filter.FilterDecision.Deny"/>, 
+            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> or <see cref="F:log4net.Filter.FilterDecision.Accept"/>.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned, then the log event is dropped 
+            immediately without consulting with the remaining filters.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned, then the next filter
+            in the chain is consulted. If there are no more filters in the
+            chain, then the log event is logged. Thus, in the presence of no
+            filters, the default behavior is to log all logging events.
+            </para>
+            <para>
+            If the value <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, then the log
+            event is logged without consulting the remaining filters.
+            </para>
+            <para>
+            The philosophy of log4net filters is largely inspired from the
+            Linux ipchains.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Decide if the logging event should be logged through an appender.
+            </summary>
+            <param name="loggingEvent">The LoggingEvent to decide upon</param>
+            <returns>The decision of the filter</returns>
+            <remarks>
+            <para>
+            If the decision is <see cref="F:log4net.Filter.FilterDecision.Deny"/>, then the event will be
+            dropped. If the decision is <see cref="F:log4net.Filter.FilterDecision.Neutral"/>, then the next
+            filter, if any, will be invoked. If the decision is <see cref="F:log4net.Filter.FilterDecision.Accept"/> then
+            the event will be logged without consulting with other filters in
+            the chain.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.IFilter.Next">
+            <summary>
+            Property to get and set the next filter
+            </summary>
+            <value>
+            The next filter in the chain
+            </value>
+            <remarks>
+            <para>
+            Filters are typically composed into chains. This property allows the next filter in 
+            the chain to be accessed.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Filter.FilterSkeleton.m_next">
+            <summary>
+            Points to the next filter in the filter chain.
+            </summary>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Filter.FilterSkeleton.Next"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Filter.FilterSkeleton.ActivateOptions">
+            <summary>
+            Initialize the filter with the options set
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            Typically filter's options become active immediately on set, 
+            however this method must still be called. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Decide if the <see cref="T:log4net.Core.LoggingEvent"/> should be logged through an appender.
+            </summary>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> to decide upon</param>
+            <returns>The decision of the filter</returns>
+            <remarks>
+            <para>
+            If the decision is <see cref="F:log4net.Filter.FilterDecision.Deny"/>, then the event will be
+            dropped. If the decision is <see cref="F:log4net.Filter.FilterDecision.Neutral"/>, then the next
+            filter, if any, will be invoked. If the decision is <see cref="F:log4net.Filter.FilterDecision.Accept"/> then
+            the event will be logged without consulting with other filters in
+            the chain.
+            </para>
+            <para>
+            This method is marked <c>abstract</c> and must be implemented
+            in a subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.FilterSkeleton.Next">
+            <summary>
+            Property to get and set the next filter
+            </summary>
+            <value>
+            The next filter in the chain
+            </value>
+            <remarks>
+            <para>
+            Filters are typically composed into chains. This property allows the next filter in 
+            the chain to be accessed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Filter.DenyAllFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.DenyAllFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Always returns the integer constant <see cref="F:log4net.Filter.FilterDecision.Deny"/>
+            </summary>
+            <param name="loggingEvent">the LoggingEvent to filter</param>
+            <returns>Always returns <see cref="F:log4net.Filter.FilterDecision.Deny"/></returns>
+            <remarks>
+            <para>
+            Ignores the event being logged and just returns
+            <see cref="F:log4net.Filter.FilterDecision.Deny"/>. This can be used to change the default filter
+            chain behavior from <see cref="F:log4net.Filter.FilterDecision.Accept"/> to <see cref="F:log4net.Filter.FilterDecision.Deny"/>. This filter
+            should only be used as the last filter in the chain
+            as any further filters will be ignored!
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.FilterDecision">
+            <summary>
+            The return result from <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
+            </summary>
+            <remarks>
+            <para>
+            The return result from <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Filter.FilterDecision.Deny">
+            <summary>
+            The log event must be dropped immediately without 
+            consulting with the remaining filters, if any, in the chain.
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.FilterDecision.Neutral">
+            <summary>
+            This filter is neutral with respect to the log event. 
+            The remaining filters, if any, should be consulted for a final decision.
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.FilterDecision.Accept">
+            <summary>
+            The log event must be logged immediately without 
+            consulting with the remaining filters, if any, in the chain.
+            </summary>
+        </member>
+        <member name="T:log4net.Filter.LevelMatchFilter">
+            <summary>
+            This is a very simple filter based on <see cref="T:log4net.Core.Level"/> matching.
+            </summary>
+            <remarks>
+            <para>
+            The filter admits two options <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/> and
+            <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>. If there is an exact match between the value
+            of the <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/> option and the <see cref="T:log4net.Core.Level"/> of the 
+            <see cref="T:log4net.Core.LoggingEvent"/>, then the <see cref="M:log4net.Filter.LevelMatchFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in 
+            case the <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/> option value is set
+            to <c>true</c>, if it is <c>false</c> then 
+            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned. If the <see cref="T:log4net.Core.Level"/> does not match then
+            the result will be <see cref="F:log4net.Filter.FilterDecision.Neutral"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Filter.LevelMatchFilter.m_acceptOnMatch">
+            <summary>
+            flag to indicate if the filter should <see cref="F:log4net.Filter.FilterDecision.Accept"/> on a match
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.LevelMatchFilter.m_levelToMatch">
+            <summary>
+            the <see cref="T:log4net.Core.Level"/> to match against
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LevelMatchFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LevelMatchFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Tests if the <see cref="T:log4net.Core.Level"/> of the logging event matches that of the filter
+            </summary>
+            <param name="loggingEvent">the event to filter</param>
+            <returns>see remarks</returns>
+            <remarks>
+            <para>
+            If the <see cref="T:log4net.Core.Level"/> of the event matches the level of the
+            filter then the result of the function depends on the
+            value of <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>. If it is true then
+            the function will return <see cref="F:log4net.Filter.FilterDecision.Accept"/>, it it is false then it
+            will return <see cref="F:log4net.Filter.FilterDecision.Deny"/>. If the <see cref="T:log4net.Core.Level"/> does not match then
+            the result will be <see cref="F:log4net.Filter.FilterDecision.Neutral"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch">
+            <summary>
+            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/>
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/> property is a flag that determines
+            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
+            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
+            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Deny"/> the event.
+            </para>
+            <para>
+            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LevelMatchFilter.LevelToMatch">
+            <summary>
+            The <see cref="T:log4net.Core.Level"/> that the filter will match
+            </summary>
+            <remarks>
+            <para>
+            The level that this filter will attempt to match against the 
+            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.LevelRangeFilter">
+            <summary>
+            This is a simple filter based on <see cref="T:log4net.Core.Level"/> matching.
+            </summary>
+            <remarks>
+            <para>
+            The filter admits three options <see cref="P:log4net.Filter.LevelRangeFilter.LevelMin"/> and <see cref="P:log4net.Filter.LevelRangeFilter.LevelMax"/>
+            that determine the range of priorities that are matched, and
+            <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>. If there is a match between the range
+            of priorities and the <see cref="T:log4net.Core.Level"/> of the <see cref="T:log4net.Core.LoggingEvent"/>, then the 
+            <see cref="M:log4net.Filter.LevelRangeFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in case the <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> 
+            option value is set to <c>true</c>, if it is <c>false</c>
+            then <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned. If there is no match, <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Filter.LevelRangeFilter.m_acceptOnMatch">
+            <summary>
+            Flag to indicate the behavior when matching a <see cref="T:log4net.Core.Level"/>
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.LevelRangeFilter.m_levelMin">
+            <summary>
+            the minimum <see cref="T:log4net.Core.Level"/> value to match
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.LevelRangeFilter.m_levelMax">
+            <summary>
+            the maximum <see cref="T:log4net.Core.Level"/> value to match
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LevelRangeFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LevelRangeFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Check if the event should be logged.
+            </summary>
+            <param name="loggingEvent">the logging event to check</param>
+            <returns>see remarks</returns>
+            <remarks>
+            <para>
+            If the <see cref="T:log4net.Core.Level"/> of the logging event is outside the range
+            matched by this filter then <see cref="F:log4net.Filter.FilterDecision.Deny"/>
+            is returned. If the <see cref="T:log4net.Core.Level"/> is matched then the value of
+            <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> is checked. If it is true then
+            <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, otherwise
+            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch">
+            <summary>
+            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LevelRangeFilter.LevelMin"/> and <see cref="P:log4net.Filter.LevelRangeFilter.LevelMax"/>
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> property is a flag that determines
+            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
+            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
+            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Neutral"/> the event.
+            </para>
+            <para>
+            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LevelRangeFilter.LevelMin">
+            <summary>
+            Set the minimum matched <see cref="T:log4net.Core.Level"/>
+            </summary>
+            <remarks>
+            <para>
+            The minimum level that this filter will attempt to match against the 
+            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LevelRangeFilter.LevelMax">
+            <summary>
+            Sets the maximum matched <see cref="T:log4net.Core.Level"/>
+            </summary>
+            <remarks>
+            <para>
+            The maximum level that this filter will attempt to match against the 
+            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.LoggerMatchFilter">
+            <summary>
+            Simple filter to match a string in the event's logger name.
+            </summary>
+            <remarks>
+            <para>
+            The works very similar to the <see cref="T:log4net.Filter.LevelMatchFilter"/>. It admits two 
+            options <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> and <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/>. If the 
+            <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the <see cref="T:log4net.Core.LoggingEvent"/> starts 
+            with the value of the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> option, then the 
+            <see cref="M:log4net.Filter.LoggerMatchFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in 
+            case the <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> option value is set to <c>true</c>, 
+            if it is <c>false</c> then <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
+            </para>
+            </remarks>
+            <author>Daniel Cazzulino</author>
+        </member>
+        <member name="F:log4net.Filter.LoggerMatchFilter.m_acceptOnMatch">
+            <summary>
+            Flag to indicate the behavior when we have a match
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.LoggerMatchFilter.m_loggerToMatch">
+            <summary>
+            The logger name string to substring match against the event
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LoggerMatchFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.LoggerMatchFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Check if this filter should allow the event to be logged
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>see remarks</returns>
+            <remarks>
+            <para>
+            The rendered message is matched against the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/>.
+            If the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> equals the beginning of 
+            the incoming <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> (<see cref="M:String.StartsWith(string)"/>)
+            then a match will have occurred. If no match occurs
+            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
+            allowing other filters to check the event. If a match occurs then
+            the value of <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> is checked. If it is
+            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
+            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch">
+            <summary>
+            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/>
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> property is a flag that determines
+            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
+            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
+            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Deny"/> the event.
+            </para>
+            <para>
+            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch">
+            <summary>
+            The <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> that the filter will match
+            </summary>
+            <remarks>
+            <para>
+            This filter will attempt to match this value against logger name in
+            the following way. The match will be done against the beginning of the
+            logger name (using <see cref="M:String.StartsWith(string)"/>). The match is
+            case sensitive. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.MdcFilter">
+            <summary>
+            Simple filter to match a keyed string in the <see cref="T:log4net.MDC"/>
+            </summary>
+            <remarks>
+            <para>
+            Simple filter to match a keyed string in the <see cref="T:log4net.MDC"/>
+            </para>
+            <para>
+            As the MDC has been replaced with layered properties the
+            <see cref="T:log4net.Filter.PropertyFilter"/> should be used instead.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Filter.PropertyFilter">
+            <summary>
+            Simple filter to match a string an event property
+            </summary>
+            <remarks>
+            <para>
+            Simple filter to match a string in the value for a
+            specific event property
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Filter.StringMatchFilter">
+            <summary>
+            Simple filter to match a string in the rendered message
+            </summary>
+            <remarks>
+            <para>
+            Simple filter to match a string in the rendered message
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Filter.StringMatchFilter.m_acceptOnMatch">
+            <summary>
+            Flag to indicate the behavior when we have a match
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.StringMatchFilter.m_stringToMatch">
+            <summary>
+            The string to substring match against the message
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.StringMatchFilter.m_stringRegexToMatch">
+            <summary>
+            A string regex to match
+            </summary>
+        </member>
+        <member name="F:log4net.Filter.StringMatchFilter.m_regexToMatch">
+            <summary>
+            A regex object to match (generated from m_stringRegexToMatch)
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.StringMatchFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.StringMatchFilter.ActivateOptions">
+            <summary>
+            Initialize and precompile the Regex if required
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Filter.StringMatchFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Check if this filter should allow the event to be logged
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>see remarks</returns>
+            <remarks>
+            <para>
+            The rendered message is matched against the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/>.
+            If the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> occurs as a substring within
+            the message then a match will have occurred. If no match occurs
+            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
+            allowing other filters to check the event. If a match occurs then
+            the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> is checked. If it is
+            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
+            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.StringMatchFilter.AcceptOnMatch">
+            <summary>
+            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> property is a flag that determines
+            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
+            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
+            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Neutral"/> the event.
+            </para>
+            <para>
+            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.StringMatchFilter.StringToMatch">
+            <summary>
+            Sets the static string to match
+            </summary>
+            <remarks>
+            <para>
+            The string that will be substring matched against
+            the rendered message. If the message contains this
+            string then the filter will match. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/>.
+            </para>
+            <para>
+            One of <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
+            must be specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.StringMatchFilter.RegexToMatch">
+            <summary>
+            Sets the regular expression to match
+            </summary>
+            <remarks>
+            <para>
+            The regular expression pattern that will be matched against
+            the rendered message. If the message matches this
+            pattern then the filter will match. If a match is found then
+            the result depends on the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/>.
+            </para>
+            <para>
+            One of <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
+            must be specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Filter.PropertyFilter.m_key">
+            <summary>
+            The key to use to lookup the string from the event properties
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.PropertyFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Filter.PropertyFilter.Decide(log4net.Core.LoggingEvent)">
+            <summary>
+            Check if this filter should allow the event to be logged
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>see remarks</returns>
+            <remarks>
+            <para>
+            The event property for the <see cref="P:log4net.Filter.PropertyFilter.Key"/> is matched against 
+            the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/>.
+            If the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> occurs as a substring within
+            the property value then a match will have occurred. If no match occurs
+            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
+            allowing other filters to check the event. If a match occurs then
+            the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> is checked. If it is
+            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
+            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Filter.PropertyFilter.Key">
+            <summary>
+            The key to lookup in the event properties and then match against.
+            </summary>
+            <remarks>
+            <para>
+            The key name to use to lookup in the properties map of the
+            <see cref="T:log4net.Core.LoggingEvent"/>. The match will be performed against 
+            the value of this property if it exists.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Filter.NdcFilter">
+            <summary>
+            Simple filter to match a string in the <see cref="T:log4net.NDC"/>
+            </summary>
+            <remarks>
+            <para>
+            Simple filter to match a string in the <see cref="T:log4net.NDC"/>
+            </para>
+            <para>
+            As the MDC has been replaced with named stacks stored in the
+            properties collections the <see cref="T:log4net.Filter.PropertyFilter"/> should 
+            be used instead.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Filter.NdcFilter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Sets the <see cref="P:log4net.Filter.PropertyFilter.Key"/> to <c>"NDC"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AppDomainPatternConverter">
+            <summary>
+            Write the event appdomain name to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LoggingEvent.Domain"/> to the output writer.
+            </para>
+            </remarks>
+            <author>Daniel Cazzulino</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Layout.Pattern.PatternLayoutConverter">
+            <summary>
+            Abstract class that provides the formatting functionality that 
+            derived classes need.
+            </summary>
+            <remarks>
+            Conversion specifiers in a conversion patterns are parsed to
+            individual PatternConverters. Each of which is responsible for
+            converting a logging event in a converter specific manner.
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Util.PatternConverter">
+            <summary>
+            Abstract class that provides the formatting functionality that 
+            derived classes need.
+            </summary>
+            <remarks>
+            <para>
+            Conversion specifiers in a conversion patterns are parsed to
+            individual PatternConverters. Each of which is responsible for
+            converting a logging event in a converter specific manner.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Util.PatternConverter.c_renderBufferSize">
+            <summary>
+            Initial buffer size
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternConverter.c_renderBufferMaxCapacity">
+            <summary>
+            Maximum buffer size before it is recycled
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.#ctor">
+            <summary>
+            Protected constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.PatternConverter"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Evaluate this pattern converter and write the output to a writer.
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">The state object on which the pattern converter should be executed.</param>
+            <remarks>
+            <para>
+            Derived pattern converters must override this method in order to
+            convert conversion specifiers in the appropriate way.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.SetNext(log4net.Util.PatternConverter)">
+            <summary>
+            Set the next pattern converter in the chains
+            </summary>
+            <param name="patternConverter">the pattern converter that should follow this converter in the chain</param>
+            <returns>the next converter</returns>
+            <remarks>
+            <para>
+            The PatternConverter can merge with its neighbor during this method (or a sub class).
+            Therefore the return value may or may not be the value of the argument passed in.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.Format(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the pattern converter to the writer with appropriate formatting
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">The state object on which the pattern converter should be executed.</param>
+            <remarks>
+            <para>
+            This method calls <see cref="M:log4net.Util.PatternConverter.Convert(System.IO.TextWriter,System.Object)"/> to allow the subclass to perform
+            appropriate conversion of the pattern converter. If formatting options have
+            been specified via the <see cref="P:log4net.Util.PatternConverter.FormattingInfo"/> then this method will
+            apply those formattings before writing the output.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.SpacePad(System.IO.TextWriter,System.Int32)">
+            <summary>
+            Fast space padding method.
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> to which the spaces will be appended.</param>
+            <param name="length">The number of spaces to be padded.</param>
+            <remarks>
+            <para>
+            Fast space padding method.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternConverter.m_option">
+            <summary>
+            The option string to the converter
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.WriteDictionary(System.IO.TextWriter,log4net.Repository.ILoggerRepository,System.Collections.IDictionary)">
+            <summary>
+            Write an dictionary to a <see cref="T:System.IO.TextWriter"/>
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="repository">a <see cref="T:log4net.Repository.ILoggerRepository"/> to use for object conversion</param>
+            <param name="value">the value to write to the writer</param>
+            <remarks>
+            <para>
+            Writes the <see cref="T:System.Collections.IDictionary"/> to a writer in the form:
+            </para>
+            <code>
+            {key1=value1, key2=value2, key3=value3}
+            </code>
+            <para>
+            If the <see cref="T:log4net.Repository.ILoggerRepository"/> specified
+            is not null then it is used to render the key and value to text, otherwise
+            the object's ToString method is called.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.WriteDictionary(System.IO.TextWriter,log4net.Repository.ILoggerRepository,System.Collections.IDictionaryEnumerator)">
+            <summary>
+            Write an dictionary to a <see cref="T:System.IO.TextWriter"/>
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="repository">a <see cref="T:log4net.Repository.ILoggerRepository"/> to use for object conversion</param>
+            <param name="value">the value to write to the writer</param>
+            <remarks>
+            <para>
+            Writes the <see cref="T:System.Collections.IDictionaryEnumerator"/> to a writer in the form:
+            </para>
+            <code>
+            {key1=value1, key2=value2, key3=value3}
+            </code>
+            <para>
+            If the <see cref="T:log4net.Repository.ILoggerRepository"/> specified
+            is not null then it is used to render the key and value to text, otherwise
+            the object's ToString method is called.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternConverter.WriteObject(System.IO.TextWriter,log4net.Repository.ILoggerRepository,System.Object)">
+            <summary>
+            Write an object to a <see cref="T:System.IO.TextWriter"/>
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="repository">a <see cref="T:log4net.Repository.ILoggerRepository"/> to use for object conversion</param>
+            <param name="value">the value to write to the writer</param>
+            <remarks>
+            <para>
+            Writes the Object to a writer. If the <see cref="T:log4net.Repository.ILoggerRepository"/> specified
+            is not null then it is used to render the object to text, otherwise
+            the object's ToString method is called.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternConverter.Next">
+            <summary>
+            Get the next pattern converter in the chain
+            </summary>
+            <value>
+            the next pattern converter in the chain
+            </value>
+            <remarks>
+            <para>
+            Get the next pattern converter in the chain
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternConverter.FormattingInfo">
+            <summary>
+            Gets or sets the formatting info for this converter
+            </summary>
+            <value>
+            The formatting info for this converter
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the formatting info for this converter
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternConverter.Option">
+            <summary>
+            Gets or sets the option value for this converter
+            </summary>
+            <summary>
+            The option for this converter
+            </summary>
+            <remarks>
+            <para>
+            Gets or sets the option value for this converter
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternConverter.Properties">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Layout.Pattern.PatternLayoutConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Derived pattern converters must override this method in order to
+            convert conversion specifiers in the correct way.
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+        </member>
+        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Derived pattern converters must override this method in order to
+            convert conversion specifiers in the correct way.
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">The state object on which the pattern converter should be executed.</param>
+        </member>
+        <member name="F:log4net.Layout.Pattern.PatternLayoutConverter.m_ignoresException">
+            <summary>
+            Flag indicating if this converter handles exceptions
+            </summary>
+            <remarks>
+            <c>false</c> if this converter handles exceptions
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.Pattern.PatternLayoutConverter.IgnoresException">
+            <summary>
+            Flag indicating if this converter handles the logging event exception
+            </summary>
+            <value><c>false</c> if this converter handles the logging event exception</value>
+            <remarks>
+            <para>
+            If this converter handles the exception object contained within
+            <see cref="T:log4net.Core.LoggingEvent"/>, then this property should be set to
+            <c>false</c>. Otherwise, if the layout ignores the exception
+            object, then the property should be set to <c>true</c>.
+            </para>
+            <para>
+            Set this value to override a this default setting. The default
+            value is <c>true</c>, this converter does not handle the exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AppDomainPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the event appdomain name to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LoggingEvent.Domain"/> to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AspNetCachePatternConverter">
+            <summary>
+            Converter for items in the ASP.Net Cache.
+            </summary>
+            <remarks>
+            <para>
+            Outputs an item from the <see cref="P:System.Web.HttpRuntime.Cache"/>.
+            </para>
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AspNetPatternLayoutConverter">
+            <summary>
+            Abstract class that provides access to the current HttpContext (<see cref="P:System.Web.HttpContext.Current"/>) that 
+            derived classes need.
+            </summary>
+            <remarks>
+            This class handles the case when HttpContext.Current is null by writing
+            <see cref="P:log4net.Util.SystemInfo.NotAvailableText"/> to the writer.
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AspNetPatternLayoutConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent,System.Web.HttpContext)">
+            <summary>
+            Derived pattern converters must override this method in order to
+            convert conversion specifiers in the correct way.
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+            <param name="httpContext">The <see cref="T:System.Web.HttpContext"/> under which the ASP.Net request is running.</param>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AspNetCachePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent,System.Web.HttpContext)">
+            <summary>
+            Write the ASP.Net Cache item to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+            <param name="httpContext">The <see cref="T:System.Web.HttpContext"/> under which the ASP.Net request is running.</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property. If no property has been set, all key value pairs from the Cache will
+            be written to the output.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AspNetContextPatternConverter">
+            <summary>
+            Converter for items in the <see cref="T:System.Web.HttpContext"/>.
+            </summary>
+            <remarks>
+            <para>
+            Outputs an item from the <see cref="T:System.Web.HttpContext"/>.
+            </para>
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AspNetContextPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent,System.Web.HttpContext)">
+            <summary>
+            Write the ASP.Net HttpContext item to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+            <param name="httpContext">The <see cref="T:System.Web.HttpContext"/> under which the ASP.Net request is running.</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AspNetRequestPatternConverter">
+            <summary>
+            Converter for items in the ASP.Net Cache.
+            </summary>
+            <remarks>
+            <para>
+            Outputs an item from the <see cref="P:System.Web.HttpRuntime.Cache"/>.
+            </para>
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AspNetRequestPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent,System.Web.HttpContext)">
+            <summary>
+            Write the ASP.Net Cache item to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+            <param name="httpContext">The <see cref="T:System.Web.HttpContext"/> under which the ASP.Net request is running.</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.AspNetSessionPatternConverter">
+            <summary>
+            Converter for items in the ASP.Net Cache.
+            </summary>
+            <remarks>
+            <para>
+            Outputs an item from the <see cref="P:System.Web.HttpRuntime.Cache"/>.
+            </para>
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.AspNetSessionPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent,System.Web.HttpContext)">
+            <summary>
+            Write the ASP.Net Cache item to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
+            <param name="httpContext">The <see cref="T:System.Web.HttpContext"/> under which the ASP.Net request is running.</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property. If no property has been set, all key value pairs from the Session will
+            be written to the output.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.DatePatternConverter">
+            <summary>
+            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
+            the date of a <see cref="T:log4net.Core.LoggingEvent"/>.
+            </summary>
+            <remarks>
+            <para>
+            Render the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the writer as a string.
+            </para>
+            <para>
+            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
+            the formatting of the date. The following values are allowed:
+            <list type="definition">
+            	<listheader>
+            		<term>Option value</term>
+            		<description>Output</description>
+            	</listheader>
+            	<item>
+            		<term>ISO8601</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> formatter. 
+            		Formats using the <c>"yyyy-MM-dd HH:mm:ss,fff"</c> pattern.
+            		</description>
+            	</item>
+            	<item>
+            		<term>DATE</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> formatter. 
+            		Formats using the <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, <c>"06 Nov 1994 15:49:37,459"</c>.
+            		</description>
+            	</item>
+            	<item>
+            		<term>ABSOLUTE</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/> formatter. 
+            		Formats using the <c>"HH:mm:ss,yyyy"</c> for example, <c>"15:49:37,459"</c>.
+            		</description>
+            	</item>
+            	<item>
+            		<term>other</term>
+            		<description>
+            		Any other pattern string uses the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> formatter. 
+            		This formatter passes the pattern string to the <see cref="T:System.DateTime"/> 
+            		<see cref="M:DateTime.ToString(string)"/> method.
+            		For details on valid patterns see 
+            		<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemglobalizationdatetimeformatinfoclasstopic.asp">DateTimeFormatInfo Class</a>.
+            		</description>
+            	</item>
+            </list>
+            </para>
+            <para>
+            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> is in the local time zone and is rendered in that zone.
+            To output the time in Universal time see <see cref="T:log4net.Layout.Pattern.UtcDatePatternConverter"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Layout.Pattern.DatePatternConverter.m_dateFormatter">
+            <summary>
+            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter pattern based on the <see cref="P:log4net.Util.PatternConverter.Option"/> property.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.DatePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Convert the pattern into the rendered message
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Pass the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
+            for it to render it to the writer.
+            </para>
+            <para>
+            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> passed is in the local time zone.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.Pattern.DatePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the DatePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.ExceptionPatternConverter">
+            <summary>
+            Write the exception text to the output
+            </summary>
+            <remarks>
+            <para>
+            If an exception object is stored in the logging event
+            it will be rendered into the pattern output with a
+            trailing newline.
+            </para>
+            <para>
+            If there is no exception then nothing will be output
+            and no trailing newline will be appended.
+            It is typical to put a newline before the exception
+            and to have the exception as the last data in the pattern.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.ExceptionPatternConverter.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.Pattern.ExceptionPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the exception text to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            If an exception object is stored in the logging event
+            it will be rendered into the pattern output with a
+            trailing newline.
+            </para>
+            <para>
+            If there is no exception or the exception property specified
+            by the Option value does not exist then nothing will be output
+            and no trailing newline will be appended.
+            It is typical to put a newline before the exception
+            and to have the exception as the last data in the pattern.
+            </para>
+            <para>
+            Recognized values for the Option parameter are:
+            </para>
+            <list type="bullet">
+            	<item>
+            		<description>Message</description>
+            	</item>
+            	<item>
+            		<description>Source</description>
+            	</item>
+            	<item>
+            		<description>StackTrace</description>
+            	</item>
+            	<item>
+            		<description>TargetSite</description>
+            	</item>
+            	<item>
+            		<description>HelpLink</description>
+            	</item>		
+            </list>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.FileLocationPatternConverter">
+            <summary>
+            Writes the caller location file name to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the value of the <see cref="P:log4net.Core.LocationInfo.FileName"/> for
+            the event to the output writer.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.FileLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the caller location file name to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the value of the <see cref="P:log4net.Core.LocationInfo.FileName"/> for
+            the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.FullLocationPatternConverter">
+            <summary>
+            Write the caller location info to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LocationInfo.FullInfo"/> to the output writer.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.FullLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the caller location info to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LocationInfo.FullInfo"/> to the output writer.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.IdentityPatternConverter">
+            <summary>
+            Writes the event identity to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the value of the <see cref="P:log4net.Core.LoggingEvent.Identity"/> to
+            the output writer.
+            </para>
+            </remarks>
+            <author>Daniel Cazzulino</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.IdentityPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Writes the event identity to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the value of the <paramref name="loggingEvent"/> 
+            <see cref="P:log4net.Core.LoggingEvent.Identity"/> to
+            the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.LevelPatternConverter">
+            <summary>
+            Write the event level to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the display name of the event <see cref="P:log4net.Core.LoggingEvent.Level"/>
+            to the writer.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.LevelPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the event level to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.Level.DisplayName"/> of the <paramref name="loggingEvent"/> <see cref="P:log4net.Core.LoggingEvent.Level"/>
+            to the <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.LineLocationPatternConverter">
+            <summary>
+            Write the caller location line number to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the value of the <see cref="P:log4net.Core.LocationInfo.LineNumber"/> for
+            the event to the output writer.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.LineLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the caller location line number to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the value of the <see cref="P:log4net.Core.LocationInfo.LineNumber"/> for
+            the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.LoggerPatternConverter">
+            <summary>
+            Converter for logger name
+            </summary>
+            <remarks>
+            <para>
+            Outputs the <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the event.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="T:log4net.Layout.Pattern.NamedPatternConverter">
+            <summary>
+            Converter to output and truncate <c>'.'</c> separated strings
+            </summary>
+            <remarks>
+            <para>
+            This abstract class supports truncating a <c>'.'</c> separated string
+            to show a specified number of elements from the right hand side.
+            This is used to truncate class names that are fully qualified.
+            </para>
+            <para>
+            Subclasses should override the <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)"/> method to
+            return the fully qualified string.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter 
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
+            <summary>
+            Get the fully qualified string data
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>the fully qualified name</returns>
+            <remarks>
+            <para>
+            Overridden by subclasses to get the fully qualified name before the
+            precision is applied to it.
+            </para>
+            <para>
+            Return the fully qualified <c>'.'</c> (dot/period) separated string.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Convert the pattern to the rendered message
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            Render the <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)"/> to the precision
+            specified by the <see cref="P:log4net.Util.PatternConverter.Option"/> property.
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.Pattern.NamedPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the NamedPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.LoggerPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
+            <summary>
+            Gets the fully qualified name of the logger
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>The fully qualified logger name</returns>
+            <remarks>
+            <para>
+            Returns the <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the <paramref name="loggingEvent"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.MessagePatternConverter">
+            <summary>
+            Writes the event message to the output
+            </summary>
+            <remarks>
+            <para>
+            Uses the <see cref="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)"/> method
+            to write out the event message.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.MessagePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Writes the event message to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Uses the <see cref="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)"/> method
+            to write out the event message.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.MethodLocationPatternConverter">
+            <summary>
+            Write the method name to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the caller location <see cref="P:log4net.Core.LocationInfo.MethodName"/> to
+            the output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.MethodLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the method name to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the caller location <see cref="P:log4net.Core.LocationInfo.MethodName"/> to
+            the output.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.NdcPatternConverter">
+            <summary>
+            Converter to include event NDC
+            </summary>
+            <remarks>
+            <para>
+            Outputs the value of the event property named <c>NDC</c>.
+            </para>
+            <para>
+            The <see cref="T:log4net.Layout.Pattern.PropertyPatternConverter"/> should be used instead.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.NdcPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the event NDC to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            As the thread context stacks are now stored in named event properties
+            this converter simply looks up the value of the <c>NDC</c> property.
+            </para>
+            <para>
+            The <see cref="T:log4net.Layout.Pattern.PropertyPatternConverter"/> should be used instead.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.PropertyPatternConverter">
+            <summary>
+            Property pattern converter
+            </summary>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
+            then all the properties are written as key value pairs.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.PropertyPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the property value to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
+            then all the properties are written as key value pairs.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.RelativeTimePatternConverter">
+            <summary>
+            Converter to output the relative time of the event
+            </summary>
+            <remarks>
+            <para>
+            Converter to output the time of the event relative to the start of the program.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.RelativeTimePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the relative time to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes out the relative time of the event in milliseconds.
+            That is the number of milliseconds between the event <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/>
+            and the <see cref="P:log4net.Core.LoggingEvent.StartTime"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.RelativeTimePatternConverter.TimeDifferenceInMillis(System.DateTime,System.DateTime)">
+            <summary>
+            Helper method to get the time difference between two DateTime objects
+            </summary>
+            <param name="start">start time (in the current local time zone)</param>
+            <param name="end">end time (in the current local time zone)</param>
+            <returns>the time difference in milliseconds</returns>
+        </member>
+        <member name="T:log4net.Layout.Pattern.StackTraceDetailPatternConverter">
+            <summary>
+            Write the caller stack frames to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LocationInfo.StackFrames"/> to the output writer, using format:
+            type3.MethodCall3(type param,...) &gt; type2.MethodCall2(type param,...) &gt; type1.MethodCall1(type param,...)
+            </para>
+            </remarks>
+            <author>Adam Davies</author>
+        </member>
+        <member name="T:log4net.Layout.Pattern.StackTracePatternConverter">
+            <summary>
+            Write the caller stack frames to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LocationInfo.StackFrames"/> to the output writer, using format:
+            type3.MethodCall3 &gt; type2.MethodCall2 &gt; type1.MethodCall1
+            </para>
+            </remarks>
+            <author>Michael Cromwell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.StackTracePatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.Pattern.StackTracePatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.Pattern.StackTracePatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.Pattern.StackTracePatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.StackTracePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the strack frames to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LocationInfo.StackFrames"/> to the output writer.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Pattern.StackTracePatternConverter.GetMethodInformation(log4net.Core.MethodItem)">
+            <summary>
+            Returns the Name of the method
+            </summary>
+            <param name="method"></param>
+            <remarks>This method was created, so this class could be used as a base class for StackTraceDetailPatternConverter</remarks>
+            <returns>string</returns>
+        </member>
+        <member name="F:log4net.Layout.Pattern.StackTracePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the StackTracePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.Pattern.StackTraceDetailPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the StackTraceDetailPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.ThreadPatternConverter">
+            <summary>
+            Converter to include event thread name
+            </summary>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LoggingEvent.ThreadName"/> to the output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.ThreadPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the ThreadName to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Writes the <see cref="P:log4net.Core.LoggingEvent.ThreadName"/> to the <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.TypeNamePatternConverter">
+            <summary>
+            Pattern converter for the class name
+            </summary>
+            <remarks>
+            <para>
+            Outputs the <see cref="P:log4net.Core.LocationInfo.ClassName"/> of the event.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.TypeNamePatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
+            <summary>
+            Gets the fully qualified name of the class
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <returns>The fully qualified type name for the caller location</returns>
+            <remarks>
+            <para>
+            Returns the <see cref="P:log4net.Core.LocationInfo.ClassName"/> of the <paramref name="loggingEvent"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Pattern.UserNamePatternConverter">
+            <summary>
+            Converter to include event user name
+            </summary>
+            <author>Douglas de la Torre</author>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.UserNamePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Convert the pattern to the rendered message
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+        </member>
+        <member name="T:log4net.Layout.Pattern.UtcDatePatternConverter">
+            <summary>
+            Write the TimeStamp to the output
+            </summary>
+            <remarks>
+            <para>
+            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
+            the date of a <see cref="T:log4net.Core.LoggingEvent"/>.
+            </para>
+            <para>
+            Uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> 
+            in Universal time.
+            </para>
+            <para>
+            See the <see cref="T:log4net.Layout.Pattern.DatePatternConverter"/> for details on the date pattern syntax.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Layout.Pattern.DatePatternConverter"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.Pattern.UtcDatePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Write the TimeStamp to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Pass the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
+            for it to render it to the writer.
+            </para>
+            <para>
+            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> passed is in the local time zone, this is converted
+            to Universal time before it is rendered.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Layout.Pattern.DatePatternConverter"/>
+        </member>
+        <member name="F:log4net.Layout.Pattern.UtcDatePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the UtcDatePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.DynamicPatternLayout">
+            <summary>
+            A flexible layout configurable with pattern string that re-evaluates on each call.
+            </summary>
+            <remarks>
+            <para>This class is built on <see cref="T:log4net.Layout.PatternLayout"></see> and provides all the
+            features and capabilities of PatternLayout.  PatternLayout is a 'static' class
+            in that its layout is done once at configuration time.  This class will recreate
+            the layout on each reference.</para>
+            <para>One important difference between PatternLayout and DynamicPatternLayout is the
+            treatment of the Header and Footer parameters in the configuration.  The Header and Footer
+            parameters for DynamicPatternLayout must be syntactically in the form of a PatternString,
+            but should not be marked as type log4net.Util.PatternString.  Doing so causes the
+            pattern to be statically converted at configuration time and causes DynamicPatternLayout
+            to perform the same as PatternLayout.</para>
+            <para>Please see <see cref="T:log4net.Layout.PatternLayout"/> for complete documentation.</para>
+            <example>
+            &lt;layout type="log4net.Layout.DynamicPatternLayout"&gt;
+              &lt;param name="Header" value="%newline**** Trace Opened     Local: %date{yyyy-MM-dd HH:mm:ss.fff}     UTC: %utcdate{yyyy-MM-dd HH:mm:ss.fff} ****%newline" /&gt;
+              &lt;param name="Footer" value="**** Trace Closed %date{yyyy-MM-dd HH:mm:ss.fff} ****%newline" /&gt;
+            &lt;/layout&gt;
+            </example>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.PatternLayout">
+            <summary>
+            A flexible layout configurable with pattern string.
+            </summary>
+            <remarks>
+            <para>
+            The goal of this class is to <see cref="M:PatternLayout.Format(TextWriter,LoggingEvent)"/> a 
+            <see cref="T:log4net.Core.LoggingEvent"/> as a string. The results
+            depend on the <i>conversion pattern</i>.
+            </para>
+            <para>
+            The conversion pattern is closely related to the conversion
+            pattern of the printf function in C. A conversion pattern is
+            composed of literal text and format control expressions called
+            <i>conversion specifiers</i>.
+            </para>
+            <para>
+            <i>You are free to insert any literal text within the conversion
+            pattern.</i>
+            </para>
+            <para>
+            Each conversion specifier starts with a percent sign (%) and is
+            followed by optional <i>format modifiers</i> and a <i>conversion
+            pattern name</i>. The conversion pattern name specifies the type of
+            data, e.g. logger, level, date, thread name. The format
+            modifiers control such things as field width, padding, left and
+            right justification. The following is a simple example.
+            </para>
+            <para>
+            Let the conversion pattern be <b>"%-5level [%thread]: %message%newline"</b> and assume
+            that the log4net environment was set to use a PatternLayout. Then the
+            statements
+            </para>
+            <code lang="C#">
+            ILog log = LogManager.GetLogger(typeof(TestApp));
+            log.Debug("Message 1");
+            log.Warn("Message 2");   
+            </code>
+            <para>would yield the output</para>
+            <code>
+            DEBUG [main]: Message 1
+            WARN  [main]: Message 2  
+            </code>
+            <para>
+            Note that there is no explicit separator between text and
+            conversion specifiers. The pattern parser knows when it has reached
+            the end of a conversion specifier when it reads a conversion
+            character. In the example above the conversion specifier
+            <b>%-5level</b> means the level of the logging event should be left
+            justified to a width of five characters.
+            </para>
+            <para>
+            The recognized conversion pattern names are:
+            </para>
+            <list type="table">
+                <listheader>
+                    <term>Conversion Pattern Name</term>
+                    <description>Effect</description>
+                </listheader>
+                <item>
+                    <term>a</term>
+                    <description>Equivalent to <b>appdomain</b></description>
+                </item>
+                <item>
+                    <term>appdomain</term>
+                    <description>
+            			Used to output the friendly name of the AppDomain where the 
+            			logging event was generated. 
+                    </description>
+                </item>
+                <item>
+                    <term>aspnet-cache</term>
+                    <description>
+                        <para>
+                        Used to output all cache items in the case of <b>%aspnet-cache</b> or just one named item if used as <b>%aspnet-cache{key}</b>
+                        </para>
+                        <para>
+                        This pattern is not available for Compact Framework or Client Profile assemblies.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>aspnet-context</term>
+                    <description>
+                        <para>
+                        Used to output all context items in the case of <b>%aspnet-context</b> or just one named item if used as <b>%aspnet-context{key}</b>
+                        </para>
+                        <para>
+                        This pattern is not available for Compact Framework or Client Profile assemblies.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>aspnet-request</term>
+                    <description>
+                        <para>
+                        Used to output all request parameters in the case of <b>%aspnet-request</b> or just one named param if used as <b>%aspnet-request{key}</b>
+                        </para>
+                        <para>
+                        This pattern is not available for Compact Framework or Client Profile assemblies.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>aspnet-session</term>
+                    <description>
+                        <para>
+                        Used to output all session items in the case of <b>%aspnet-session</b> or just one named item if used as <b>%aspnet-session{key}</b>
+                        </para>
+                        <para>
+                        This pattern is not available for Compact Framework or Client Profile assemblies.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>c</term>
+                    <description>Equivalent to <b>logger</b></description>
+                </item>
+                <item>
+                    <term>C</term>
+                    <description>Equivalent to <b>type</b></description>
+                </item>
+                <item>
+                    <term>class</term>
+                    <description>Equivalent to <b>type</b></description>
+                </item>
+                <item>
+                    <term>d</term>
+                    <description>Equivalent to <b>date</b></description>
+                </item>
+                <item>
+            		<term>date</term> 
+            		<description>
+            			<para>
+            			Used to output the date of the logging event in the local time zone. 
+            			To output the date in universal time use the <c>%utcdate</c> pattern.
+            			The date conversion 
+            			specifier may be followed by a <i>date format specifier</i> enclosed 
+            			between braces. For example, <b>%date{HH:mm:ss,fff}</b> or
+            			<b>%date{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
+            			given then ISO8601 format is
+            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
+            			</para>
+            			<para>
+            			The date format specifier admits the same syntax as the
+            			time pattern string of the <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            			<para>
+            			For better results it is recommended to use the log4net date
+            			formatters. These can be specified using one of the strings
+            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
+            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
+            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
+            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
+            			<b>%date{ISO8601}</b> or <b>%date{ABSOLUTE}</b>.
+            			</para>
+            			<para>
+            			These dedicated date formatters perform significantly
+            			better than <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>exception</term>
+            		<description>
+            			<para>
+            			Used to output the exception passed in with the log message.
+            			</para>
+            			<para>
+            			If an exception object is stored in the logging event
+            			it will be rendered into the pattern output with a
+            			trailing newline.
+            			If there is no exception then nothing will be output
+            			and no trailing newline will be appended.
+            			It is typical to put a newline before the exception
+            			and to have the exception as the last data in the pattern.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>F</term>
+                    <description>Equivalent to <b>file</b></description>
+                </item>
+            	<item>
+            		<term>file</term>
+            		<description>
+            			<para>
+            			Used to output the file name where the logging request was
+            			issued.
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating caller location information is
+            			extremely slow. Its use should be avoided unless execution speed
+            			is not an issue.
+            			</para>
+            			<para>
+            			See the note below on the availability of caller location information.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>identity</term>
+            		<description>
+            			<para>
+            			Used to output the user name for the currently active user
+            			(Principal.Identity.Name).
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating caller information is
+            			extremely slow. Its use should be avoided unless execution speed
+            			is not an issue.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>l</term>
+                    <description>Equivalent to <b>location</b></description>
+                </item>
+                <item>
+                    <term>L</term>
+                    <description>Equivalent to <b>line</b></description>
+                </item>
+            	<item>
+            		<term>location</term>
+            		<description>
+            			<para>
+            			Used to output location information of the caller which generated
+            			the logging event.
+            			</para>
+            			<para>
+            			The location information depends on the CLI implementation but
+            			usually consists of the fully qualified name of the calling
+            			method followed by the callers source the file name and line
+            			number between parentheses.
+            			</para>
+            			<para>
+            			The location information can be very useful. However, its
+            			generation is <b>extremely</b> slow. Its use should be avoided
+            			unless execution speed is not an issue.
+            			</para>
+            			<para>
+            			See the note below on the availability of caller location information.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>level</term>
+            		<description>
+            			<para>
+            			Used to output the level of the logging event.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>line</term>
+            		<description>
+            			<para>
+            			Used to output the line number from where the logging request
+            			was issued.
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating caller location information is
+            			extremely slow. Its use should be avoided unless execution speed
+            			is not an issue.
+            			</para>
+            			<para>
+            			See the note below on the availability of caller location information.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>logger</term>
+                    <description>
+                        <para>
+            			Used to output the logger of the logging event. The
+            			logger conversion specifier can be optionally followed by
+            			<i>precision specifier</i>, that is a decimal constant in
+            			brackets.
+                        </para>
+            			<para>
+            			If a precision specifier is given, then only the corresponding
+            			number of right most components of the logger name will be
+            			printed. By default the logger name is printed in full.
+            			</para>
+            			<para>
+            			For example, for the logger name "a.b.c" the pattern
+            			<b>%logger{2}</b> will output "b.c".
+            			</para>
+                    </description>
+                </item>
+                <item>
+                    <term>m</term>
+                    <description>Equivalent to <b>message</b></description>
+                </item>
+                <item>
+                    <term>M</term>
+                    <description>Equivalent to <b>method</b></description>
+                </item>
+            	<item>
+            		<term>message</term>
+            		<description>
+            			<para>
+            			Used to output the application supplied message associated with 
+            			the logging event.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>mdc</term>
+            		<description>
+            			<para>
+            			The MDC (old name for the ThreadContext.Properties) is now part of the
+            			combined event properties. This pattern is supported for compatibility
+            			but is equivalent to <b>property</b>.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>method</term>
+            		<description>
+            			<para>
+            			Used to output the method name where the logging request was
+            			issued.
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating caller location information is
+            			extremely slow. Its use should be avoided unless execution speed
+            			is not an issue.
+            			</para>
+            			<para>
+            			See the note below on the availability of caller location information.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>n</term>
+                    <description>Equivalent to <b>newline</b></description>
+                </item>
+            	<item>
+            		<term>newline</term>
+            		<description>
+            			<para>
+            			Outputs the platform dependent line separator character or
+            			characters.
+            			</para>
+            			<para>
+            			This conversion pattern offers the same performance as using 
+            			non-portable line separator strings such as	"\n", or "\r\n". 
+            			Thus, it is the preferred way of specifying a line separator.
+            			</para> 
+            		</description>
+            	</item>
+            	<item>
+            		<term>ndc</term>
+            		<description>
+            			<para>
+            			Used to output the NDC (nested diagnostic context) associated
+            			with the thread that generated the logging event.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>p</term>
+                    <description>Equivalent to <b>level</b></description>
+                </item>
+                <item>
+                    <term>P</term>
+                    <description>Equivalent to <b>property</b></description>
+                </item>
+                <item>
+                    <term>properties</term>
+                    <description>Equivalent to <b>property</b></description>
+                </item>
+            	<item>
+            		<term>property</term>
+            		<description>
+            			<para>
+            			Used to output the an event specific property. The key to 
+            			lookup must be specified within braces and directly following the
+            			pattern specifier, e.g. <b>%property{user}</b> would include the value
+            			from the property that is keyed by the string 'user'. Each property value
+            			that is to be included in the log must be specified separately.
+            			Properties are added to events by loggers or appenders. By default 
+            			the <c>log4net:HostName</c> property is set to the name of machine on 
+            			which the event was originally logged.
+            			</para>
+            			<para>
+            			If no key is specified, e.g. <b>%property</b> then all the keys and their
+            			values are printed in a comma separated list.
+            			</para>
+            			<para>
+            			The properties of an event are combined from a number of different
+            			contexts. These are listed below in the order in which they are searched.
+            			</para>
+            			<list type="definition">
+            				<item>
+            					<term>the event properties</term>
+            					<description>
+            					The event has <see cref="P:log4net.Core.LoggingEvent.Properties"/> that can be set. These 
+            					properties are specific to this event only.
+            					</description>
+            				</item>
+            				<item>
+            					<term>the thread properties</term>
+            					<description>
+            					The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
+            					thread. These properties are shared by all events logged on this thread.
+            					</description>
+            				</item>
+            				<item>
+            					<term>the global properties</term>
+            					<description>
+            					The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
+            					properties are shared by all the threads in the AppDomain.
+            					</description>
+            				</item>
+            			</list>
+            			
+            		</description>
+            	</item>
+                <item>
+                    <term>r</term>
+                    <description>Equivalent to <b>timestamp</b></description>
+                </item>
+            	<item>
+            		<term>stacktrace</term> 
+            		<description>
+            			<para>
+            			Used to output the stack trace of the logging event
+            			The stack trace level specifier may be enclosed 
+            			between braces. For example, <b>%stacktrace{level}</b>.  
+            			If no stack trace level specifier is given then 1 is assumed 
+            			</para>
+            			<para>
+            			Output uses the format:
+            			type3.MethodCall3 &gt; type2.MethodCall2 &gt; type1.MethodCall1
+            			</para>
+                        <para>
+                        This pattern is not available for Compact Framework assemblies.
+                        </para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>stacktracedetail</term> 
+            		<description>
+            			<para>
+            			Used to output the stack trace of the logging event
+            			The stack trace level specifier may be enclosed 
+            			between braces. For example, <b>%stacktracedetail{level}</b>.  
+            			If no stack trace level specifier is given then 1 is assumed 
+            			</para>
+            			<para>
+            			Output uses the format:
+                        type3.MethodCall3(type param,...) &gt; type2.MethodCall2(type param,...) &gt; type1.MethodCall1(type param,...)
+            			</para>
+                        <para>
+                        This pattern is not available for Compact Framework assemblies.
+                        </para>
+            		</description>
+            	</item>
+                <item>
+                    <term>t</term>
+                    <description>Equivalent to <b>thread</b></description>
+                </item>
+            	<item>
+            		<term>timestamp</term>
+            		<description>
+            			<para>
+            			Used to output the number of milliseconds elapsed since the start
+            			of the application until the creation of the logging event.
+            			</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term>thread</term>
+            		<description>
+            			<para>
+            			Used to output the name of the thread that generated the
+            			logging event. Uses the thread number if no name is available.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+            		<term>type</term> 
+            		<description>
+            			<para>
+            			Used to output the fully qualified type name of the caller
+            			issuing the logging request. This conversion specifier
+            			can be optionally followed by <i>precision specifier</i>, that
+            			is a decimal constant in brackets.
+            			</para>
+            			<para>
+            			If a precision specifier is given, then only the corresponding
+            			number of right most components of the class name will be
+            			printed. By default the class name is output in fully qualified form.
+            			</para>
+            			<para>
+            			For example, for the class name "log4net.Layout.PatternLayout", the
+            			pattern <b>%type{1}</b> will output "PatternLayout".
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating the caller class information is
+            			slow. Thus, its use should be avoided unless execution speed is
+            			not an issue.
+            			</para>
+            			<para>
+            			See the note below on the availability of caller location information.
+            			</para>
+            		</description>
+                </item>
+                <item>
+                    <term>u</term>
+                    <description>Equivalent to <b>identity</b></description>
+                </item>
+            	<item>
+            		<term>username</term>
+            		<description>
+            			<para>
+            			Used to output the WindowsIdentity for the currently
+            			active user.
+            			</para>
+            			<para>
+            			<b>WARNING</b> Generating caller WindowsIdentity information is
+            			extremely slow. Its use should be avoided unless execution speed
+            			is not an issue.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+            		<term>utcdate</term> 
+            		<description>
+            			<para>
+            			Used to output the date of the logging event in universal time. 
+            			The date conversion 
+            			specifier may be followed by a <i>date format specifier</i> enclosed 
+            			between braces. For example, <b>%utcdate{HH:mm:ss,fff}</b> or
+            			<b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
+            			given then ISO8601 format is
+            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
+            			</para>
+            			<para>
+            			The date format specifier admits the same syntax as the
+            			time pattern string of the <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            			<para>
+            			For better results it is recommended to use the log4net date
+            			formatters. These can be specified using one of the strings
+            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
+            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
+            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
+            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
+            			<b>%utcdate{ISO8601}</b> or <b>%utcdate{ABSOLUTE}</b>.
+            			</para>
+            			<para>
+            			These dedicated date formatters perform significantly
+            			better than <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            		</description>
+            	</item>
+                <item>
+                    <term>w</term>
+                    <description>Equivalent to <b>username</b></description>
+                </item>
+                <item>
+                    <term>x</term>
+                    <description>Equivalent to <b>ndc</b></description>
+                </item>
+                <item>
+                    <term>X</term>
+                    <description>Equivalent to <b>mdc</b></description>
+                </item>
+            	<item>
+            		<term>%</term>
+            		<description>
+            			<para>
+            			The sequence %% outputs a single percent sign.
+            			</para>
+            		</description>
+            	</item>
+            </list>
+            <para>
+            The single letter patterns are deprecated in favor of the 
+            longer more descriptive pattern names.
+            </para>
+            <para>
+            By default the relevant information is output as is. However,
+            with the aid of format modifiers it is possible to change the
+            minimum field width, the maximum field width and justification.
+            </para>
+            <para>
+            The optional format modifier is placed between the percent sign
+            and the conversion pattern name.
+            </para>
+            <para>
+            The first optional format modifier is the <i>left justification
+            flag</i> which is just the minus (-) character. Then comes the
+            optional <i>minimum field width</i> modifier. This is a decimal
+            constant that represents the minimum number of characters to
+            output. If the data item requires fewer characters, it is padded on
+            either the left or the right until the minimum width is
+            reached. The default is to pad on the left (right justify) but you
+            can specify right padding with the left justification flag. The
+            padding character is space. If the data item is larger than the
+            minimum field width, the field is expanded to accommodate the
+            data. The value is never truncated.
+            </para>
+            <para>
+            This behavior can be changed using the <i>maximum field
+            width</i> modifier which is designated by a period followed by a
+            decimal constant. If the data item is longer than the maximum
+            field, then the extra characters are removed from the
+            <i>beginning</i> of the data item and not from the end. For
+            example, it the maximum field width is eight and the data item is
+            ten characters long, then the first two characters of the data item
+            are dropped. This behavior deviates from the printf function in C
+            where truncation is done from the end.
+            </para>
+            <para>
+            Below are various format modifier examples for the logger
+            conversion specifier.
+            </para>
+            <div class="tablediv">
+            	<table class="dtTABLE" cellspacing="0">
+            		<tr>
+            			<th>Format modifier</th>
+            			<th>left justify</th>
+            			<th>minimum width</th>
+            			<th>maximum width</th>
+            			<th>comment</th>
+            		</tr>
+            		<tr>
+            			<td align="center">%20logger</td>
+            			<td align="center">false</td>
+            			<td align="center">20</td>
+            			<td align="center">none</td>
+            			<td>
+            				<para>
+            				Left pad with spaces if the logger name is less than 20
+            				characters long.
+            				</para>
+            			</td>
+            		</tr>
+            		<tr>
+            			<td align="center">%-20logger</td>
+            			<td align="center">true</td>
+            			<td align="center">20</td>
+            			<td align="center">none</td>
+            			<td>
+            				<para>
+            				Right pad with spaces if the logger 
+            				name is less than 20 characters long.
+            				</para>
+            			</td>
+            		</tr>
+            		<tr>
+            			<td align="center">%.30logger</td>
+            			<td align="center">NA</td>
+            			<td align="center">none</td>
+            			<td align="center">30</td>
+            			<td>
+            				<para>
+            				Truncate from the beginning if the logger 
+            				name is longer than 30 characters.
+            				</para>
+            			</td>
+            		</tr>
+            		<tr>
+            			<td align="center"><nobr>%20.30logger</nobr></td>
+            			<td align="center">false</td>
+            			<td align="center">20</td>
+            			<td align="center">30</td>
+            			<td>
+            				<para>
+            				Left pad with spaces if the logger name is shorter than 20
+            				characters. However, if logger name is longer than 30 characters,
+            				then truncate from the beginning.
+            				</para>
+            			</td>
+            		</tr>
+            		<tr>
+            			<td align="center">%-20.30logger</td>
+            			<td align="center">true</td>
+            			<td align="center">20</td>
+            			<td align="center">30</td>
+            			<td>
+            				<para>
+            				Right pad with spaces if the logger name is shorter than 20
+            				characters. However, if logger name is longer than 30 characters,
+            				then truncate from the beginning.
+            				</para>
+            			</td>
+            		</tr>
+            	</table>
+            </div>
+            <para>
+            <b>Note about caller location information.</b><br/>
+            The following patterns <c>%type %file %line %method %location %class %C %F %L %l %M</c> 
+            all generate caller location information.
+            Location information uses the <c>System.Diagnostics.StackTrace</c> class to generate
+            a call stack. The caller's information is then extracted from this stack.
+            </para>
+            <note type="caution">
+            <para>
+            The <c>System.Diagnostics.StackTrace</c> class is not supported on the 
+            .NET Compact Framework 1.0 therefore caller location information is not
+            available on that framework.
+            </para>
+            </note>
+            <note type="caution">
+            <para>
+            The <c>System.Diagnostics.StackTrace</c> class has this to say about Release builds:
+            </para>
+            <para>
+            "StackTrace information will be most informative with Debug build configurations. 
+            By default, Debug builds include debug symbols, while Release builds do not. The 
+            debug symbols contain most of the file, method name, line number, and column 
+            information used in constructing StackFrame and StackTrace objects. StackTrace 
+            might not report as many method calls as expected, due to code transformations 
+            that occur during optimization."
+            </para>
+            <para>
+            This means that in a Release build the caller information may be incomplete or may 
+            not exist at all! Therefore caller location information cannot be relied upon in a Release build.
+            </para>
+            </note>
+            <para>
+            Additional pattern converters may be registered with a specific <see cref="T:log4net.Layout.PatternLayout"/>
+            instance using the <see cref="M:AddConverter(string, Type)"/> method.
+            </para>
+            </remarks>
+            <example>
+            This is a more detailed pattern.
+            <code><b>%timestamp [%thread] %level %logger %ndc - %message%newline</b></code>
+            </example>
+            <example>
+            A similar pattern except that the relative time is
+            right padded if less than 6 digits, thread name is right padded if
+            less than 15 characters and truncated if longer and the logger
+            name is left padded if shorter than 30 characters and truncated if
+            longer.
+            <code><b>%-6timestamp [%15.15thread] %-5level %30.30logger %ndc - %message%newline</b></code>
+            </example>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Douglas de la Torre</author>
+            <author>Daniel Cazzulino</author>
+        </member>
+        <member name="T:log4net.Layout.LayoutSkeleton">
+            <summary>
+            Extend this abstract class to create your own log layout format.
+            </summary>
+            <remarks>
+            <para>
+            This is the base implementation of the <see cref="T:log4net.Layout.ILayout"/>
+            interface. Most layout objects should extend this class.
+            </para>
+            </remarks>
+            <remarks>
+            <note type="inheritinfo">
+            <para>
+            Subclasses must implement the <see cref="M:Format(TextWriter,LoggingEvent)"/>
+            method.
+            </para>
+            <para>
+            Subclasses should set the <see cref="P:log4net.Layout.LayoutSkeleton.IgnoresException"/> in their default
+            constructor.
+            </para>
+            </note>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Layout.ILayout">
+            <summary>
+            Interface implemented by layout objects
+            </summary>
+            <remarks>
+            <para>
+            An <see cref="T:log4net.Layout.ILayout"/> object is used to format a <see cref="T:log4net.Core.LoggingEvent"/>
+            as text. The <see cref="M:Format(TextWriter,LoggingEvent)"/> method is called by an
+            appender to transform the <see cref="T:log4net.Core.LoggingEvent"/> into a string.
+            </para>
+            <para>
+            The layout can also supply <see cref="P:log4net.Layout.ILayout.Header"/> and <see cref="P:log4net.Layout.ILayout.Footer"/>
+            text that is appender before any events and after all the events respectively.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.ILayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Implement this method to create your own layout format.
+            </summary>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <param name="loggingEvent">The event to format</param>
+            <remarks>
+            <para>
+            This method is called by an appender to format
+            the <paramref name="loggingEvent"/> as text and output to a writer.
+            </para>
+            <para>
+            If the caller does not have a <see cref="T:System.IO.TextWriter"/> and prefers the
+            event to be formatted as a <see cref="T:System.String"/> then the following
+            code can be used to format the event into a <see cref="T:System.IO.StringWriter"/>.
+            </para>
+            <code lang="C#">
+            StringWriter writer = new StringWriter();
+            Layout.Format(writer, loggingEvent);
+            string formattedEvent = writer.ToString();
+            </code>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.ILayout.ContentType">
+            <summary>
+            The content type output by this layout. 
+            </summary>
+            <value>The content type</value>
+            <remarks>
+            <para>
+            The content type output by this layout.
+            </para>
+            <para>
+            This is a MIME type e.g. <c>"text/plain"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.ILayout.Header">
+            <summary>
+            The header for the layout format.
+            </summary>
+            <value>the layout header</value>
+            <remarks>
+            <para>
+            The Header text will be appended before any logging events
+            are formatted and appended.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.ILayout.Footer">
+            <summary>
+            The footer for the layout format.
+            </summary>
+            <value>the layout footer</value>
+            <remarks>
+            <para>
+            The Footer text will be appended after all the logging events
+            have been formatted and appended.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.ILayout.IgnoresException">
+            <summary>
+            Flag indicating if this layout handle exceptions
+            </summary>
+            <value><c>false</c> if this layout handles exceptions</value>
+            <remarks>
+            <para>
+            If this layout handles the exception object contained within
+            <see cref="T:log4net.Core.LoggingEvent"/>, then the layout should return
+            <c>false</c>. Otherwise, if the layout ignores the exception
+            object, then the layout should return <c>true</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.LayoutSkeleton.m_header">
+            <summary>
+            The header text
+            </summary>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Layout.LayoutSkeleton.Header"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.LayoutSkeleton.m_footer">
+            <summary>
+            The footer text
+            </summary>
+            <remarks>
+            <para>
+            See <see cref="P:log4net.Layout.LayoutSkeleton.Footer"/> for more information.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.LayoutSkeleton.m_ignoresException">
+            <summary>
+            Flag indicating if this layout handles exceptions
+            </summary>
+            <remarks>
+            <para>
+            <c>false</c> if this layout handles exceptions
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.LayoutSkeleton.#ctor">
+            <summary>
+            Empty default constructor
+            </summary>
+            <remarks>
+            <para>
+            Empty default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.LayoutSkeleton.ActivateOptions">
+            <summary>
+            Activate component options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            This method must be implemented by the subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.LayoutSkeleton.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Implement this method to create your own layout format.
+            </summary>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <param name="loggingEvent">The event to format</param>
+            <remarks>
+            <para>
+            This method is called by an appender to format
+            the <paramref name="loggingEvent"/> as text.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.LayoutSkeleton.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Convenience method for easily formatting the logging event into a string variable.
+            </summary>
+            <param name="loggingEvent"></param>
+            <remarks>
+            Creates a new StringWriter instance to store the formatted logging event.
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.LayoutSkeleton.ContentType">
+            <summary>
+            The content type output by this layout. 
+            </summary>
+            <value>The content type is <c>"text/plain"</c></value>
+            <remarks>
+            <para>
+            The content type output by this layout.
+            </para>
+            <para>
+            This base class uses the value <c>"text/plain"</c>.
+            To change this value a subclass must override this
+            property.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.LayoutSkeleton.Header">
+            <summary>
+            The header for the layout format.
+            </summary>
+            <value>the layout header</value>
+            <remarks>
+            <para>
+            The Header text will be appended before any logging events
+            are formatted and appended.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.LayoutSkeleton.Footer">
+            <summary>
+            The footer for the layout format.
+            </summary>
+            <value>the layout footer</value>
+            <remarks>
+            <para>
+            The Footer text will be appended after all the logging events
+            have been formatted and appended.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.LayoutSkeleton.IgnoresException">
+            <summary>
+            Flag indicating if this layout handles exceptions
+            </summary>
+            <value><c>false</c> if this layout handles exceptions</value>
+            <remarks>
+            <para>
+            If this layout handles the exception object contained within
+            <see cref="T:log4net.Core.LoggingEvent"/>, then the layout should return
+            <c>false</c>. Otherwise, if the layout ignores the exception
+            object, then the layout should return <c>true</c>.
+            </para>
+            <para>
+            Set this value to override a this default setting. The default
+            value is <c>true</c>, this layout does not handle the exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.DefaultConversionPattern">
+            <summary>
+            Default pattern string for log output. 
+            </summary>
+            <remarks>
+            <para>
+            Default pattern string for log output. 
+            Currently set to the string <b>"%message%newline"</b> 
+            which just prints the application supplied message. 
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.DetailConversionPattern">
+            <summary>
+            A detailed conversion pattern
+            </summary>
+            <remarks>
+            <para>
+            A conversion pattern which includes Time, Thread, Logger, and Nested Context.
+            Current value is <b>%timestamp [%thread] %level %logger %ndc - %message%newline</b>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.s_globalRulesRegistry">
+            <summary>
+            Internal map of converter identifiers to converter types.
+            </summary>
+            <remarks>
+            <para>
+            This static map is overridden by the m_converterRegistry instance map
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.m_pattern">
+            <summary>
+            the pattern
+            </summary>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.m_head">
+            <summary>
+            the head of the pattern converter chain
+            </summary>
+        </member>
+        <member name="F:log4net.Layout.PatternLayout.m_instanceRulesRegistry">
+            <summary>
+            patterns defined on this PatternLayout only
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.#cctor">
+            <summary>
+            Initialize the global registry
+            </summary>
+            <remarks>
+            <para>
+            Defines the builtin global rules.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.#ctor">
+            <summary>
+            Constructs a PatternLayout using the DefaultConversionPattern
+            </summary>
+            <remarks>
+            <para>
+            The default pattern just produces the application supplied message.
+            </para>
+            <para>
+            Note to Inheritors: This constructor calls the virtual method
+            <see cref="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)"/>. If you override this method be
+            aware that it will be called before your is called constructor.
+            </para>
+            <para>
+            As per the <see cref="T:log4net.Core.IOptionHandler"/> contract the <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/>
+            method must be called after the properties on this object have been
+            configured.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.#ctor(System.String)">
+            <summary>
+            Constructs a PatternLayout using the supplied conversion pattern
+            </summary>
+            <param name="pattern">the pattern to use</param>
+            <remarks>
+            <para>
+            Note to Inheritors: This constructor calls the virtual method
+            <see cref="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)"/>. If you override this method be
+            aware that it will be called before your is called constructor.
+            </para>
+            <para>
+            When using this constructor the <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> method 
+            need not be called. This may not be the case when using a subclass.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)">
+            <summary>
+            Create the pattern parser instance
+            </summary>
+            <param name="pattern">the pattern to parse</param>
+            <returns>The <see cref="T:log4net.Util.PatternParser"/> that will format the event</returns>
+            <remarks>
+            <para>
+            Creates the <see cref="T:log4net.Util.PatternParser"/> used to parse the conversion string. Sets the
+            global and instance rules on the <see cref="T:log4net.Util.PatternParser"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.ActivateOptions">
+            <summary>
+            Initialize layout options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Produces a formatted string as specified by the conversion pattern.
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <remarks>
+            <para>
+            Parse the <see cref="T:log4net.Core.LoggingEvent"/> using the patter format
+            specified in the <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.AddConverter(log4net.Util.ConverterInfo)">
+            <summary>
+            Add a converter to this PatternLayout
+            </summary>
+            <param name="converterInfo">the converter info</param>
+            <remarks>
+            <para>
+            This version of the method is used by the configurator.
+            Programmatic users should use the alternative <see cref="M:AddConverter(string,Type)"/> method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.PatternLayout.AddConverter(System.String,System.Type)">
+            <summary>
+            Add a converter to this PatternLayout
+            </summary>
+            <param name="name">the name of the conversion pattern for this converter</param>
+            <param name="type">the type of the converter</param>
+            <remarks>
+            <para>
+            Add a named pattern converter to this instance. This
+            converter will be used in the formatting of the event.
+            This method must be called before <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/>.
+            </para>
+            <para>
+            The <paramref name="type"/> specified must extend the 
+            <see cref="T:log4net.Util.PatternConverter"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.PatternLayout.ConversionPattern">
+            <summary>
+            The pattern formatting string
+            </summary>
+            <remarks>
+            <para>
+            The <b>ConversionPattern</b> option. This is the string which
+            controls formatting and consists of a mix of literal content and
+            conversion specifiers.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.DynamicPatternLayout.m_headerPatternString">
+            <summary>
+            The header PatternString
+            </summary>
+        </member>
+        <member name="F:log4net.Layout.DynamicPatternLayout.m_footerPatternString">
+            <summary>
+            The footer PatternString
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.DynamicPatternLayout.#ctor">
+            <summary>
+            Constructs a DynamicPatternLayout using the DefaultConversionPattern
+            </summary>
+            <remarks>
+            <para>
+            The default pattern just produces the application supplied message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.DynamicPatternLayout.#ctor(System.String)">
+            <summary>
+            Constructs a DynamicPatternLayout using the supplied conversion pattern
+            </summary>
+            <param name="pattern">the pattern to use</param>
+            <remarks>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.DynamicPatternLayout.Header">
+            <summary>
+            The header for the layout format.
+            </summary>
+            <value>the layout header</value>
+            <remarks>
+            <para>
+            The Header text will be appended before any logging events
+            are formatted and appended.
+            </para>
+            The pattern will be formatted on each get operation.
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.DynamicPatternLayout.Footer">
+            <summary>
+            The footer for the layout format.
+            </summary>
+            <value>the layout footer</value>
+            <remarks>
+            <para>
+            The Footer text will be appended after all the logging events
+            have been formatted and appended.
+            </para>
+            The pattern will be formatted on each get operation.
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.ExceptionLayout">
+            <summary>
+            A Layout that renders only the Exception text from the logging event
+            </summary>
+            <remarks>
+            <para>
+            A Layout that renders only the Exception text from the logging event.
+            </para>
+            <para>
+            This Layout should only be used with appenders that utilize multiple
+            layouts (e.g. <see cref="T:log4net.Appender.AdoNetAppender"/>).
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.ExceptionLayout.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Constructs a ExceptionLayout
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.ExceptionLayout.ActivateOptions">
+            <summary>
+            Activate component options
+            </summary>
+            <remarks>
+            <para>
+            Part of the <see cref="T:log4net.Core.IOptionHandler"/> component activation
+            framework.
+            </para>
+            <para>
+            This method does nothing as options become effective immediately.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.ExceptionLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Gets the exception text from the logging event
+            </summary>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <param name="loggingEvent">the event being logged</param>
+            <remarks>
+            <para>
+            Write the exception string to the <see cref="T:System.IO.TextWriter"/>.
+            The exception string is retrieved from <see cref="M:LoggingEvent.GetExceptionString()"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.IRawLayout">
+            <summary>
+            Interface for raw layout objects
+            </summary>
+            <remarks>
+            <para>
+            Interface used to format a <see cref="T:log4net.Core.LoggingEvent"/>
+            to an object.
+            </para>
+            <para>
+            This interface should not be confused with the
+            <see cref="T:log4net.Layout.ILayout"/> interface. This interface is used in
+            only certain specialized situations where a raw object is
+            required rather than a formatted string. The <see cref="T:log4net.Layout.ILayout"/>
+            is not generally useful than this interface.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.IRawLayout.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Implement this method to create your own layout format.
+            </summary>
+            <param name="loggingEvent">The event to format</param>
+            <returns>returns the formatted event</returns>
+            <remarks>
+            <para>
+            Implement this method to create your own layout format.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.Layout2RawLayoutAdapter">
+            <summary>
+            Adapts any <see cref="T:log4net.Layout.ILayout"/> to a <see cref="T:log4net.Layout.IRawLayout"/>
+            </summary>
+            <remarks>
+            <para>
+            Where an <see cref="T:log4net.Layout.IRawLayout"/> is required this adapter
+            allows a <see cref="T:log4net.Layout.ILayout"/> to be specified.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Layout.Layout2RawLayoutAdapter.m_layout">
+            <summary>
+            The layout to adapt
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.Layout2RawLayoutAdapter.#ctor(log4net.Layout.ILayout)">
+            <summary>
+            Construct a new adapter
+            </summary>
+            <param name="layout">the layout to adapt</param>
+            <remarks>
+            <para>
+            Create the adapter for the specified <paramref name="layout"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.Layout2RawLayoutAdapter.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Format the logging event as an object.
+            </summary>
+            <param name="loggingEvent">The event to format</param>
+            <returns>returns the formatted event</returns>
+            <remarks>
+            <para>
+            Format the logging event as an object.
+            </para>
+            <para>
+            Uses the <see cref="T:log4net.Layout.ILayout"/> object supplied to 
+            the constructor to perform the formatting.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.RawLayoutConverter">
+            <summary>
+            Type converter for the <see cref="T:log4net.Layout.IRawLayout"/> interface
+            </summary>
+            <remarks>
+            <para>
+            Used to convert objects to the <see cref="T:log4net.Layout.IRawLayout"/> interface.
+            Supports converting from the <see cref="T:log4net.Layout.ILayout"/> interface to
+            the <see cref="T:log4net.Layout.IRawLayout"/> interface using the <see cref="T:log4net.Layout.Layout2RawLayoutAdapter"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.IConvertFrom">
+            <summary>
+            Interface supported by type converters
+            </summary>
+            <remarks>
+            <para>
+            This interface supports conversion from arbitrary types
+            to a single target type. See <see cref="T:log4net.Util.TypeConverters.TypeConverterAttribute"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IConvertFrom.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Test if the <paramref name="sourceType"/> can be converted to the
+            type supported by this converter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IConvertFrom.ConvertFrom(System.Object)">
+            <summary>
+            Convert the source object to the type supported by this object
+            </summary>
+            <param name="source">the object to convert</param>
+            <returns>the converted object</returns>
+            <remarks>
+            <para>
+            Converts the <paramref name="source"/> to the type supported
+            by this converter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.RawLayoutConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the sourceType be converted to an <see cref="T:log4net.Layout.IRawLayout"/>
+            </summary>
+            <param name="sourceType">the source to be to be converted</param>
+            <returns><c>true</c> if the source type can be converted to <see cref="T:log4net.Layout.IRawLayout"/></returns>
+            <remarks>
+            <para>
+            Test if the <paramref name="sourceType"/> can be converted to a
+            <see cref="T:log4net.Layout.IRawLayout"/>. Only <see cref="T:log4net.Layout.ILayout"/> is supported
+            as the <paramref name="sourceType"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.RawLayoutConverter.ConvertFrom(System.Object)">
+            <summary>
+            Convert the value to a <see cref="T:log4net.Layout.IRawLayout"/> object
+            </summary>
+            <param name="source">the value to convert</param>
+            <returns>the <see cref="T:log4net.Layout.IRawLayout"/> object</returns>
+            <remarks>
+            <para>
+            Convert the <paramref name="source"/> object to a 
+            <see cref="T:log4net.Layout.IRawLayout"/> object. If the <paramref name="source"/> object
+            is a <see cref="T:log4net.Layout.ILayout"/> then the <see cref="T:log4net.Layout.Layout2RawLayoutAdapter"/>
+            is used to adapt between the two interfaces, otherwise an
+            exception is thrown.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.RawPropertyLayout">
+            <summary>
+            Extract the value of a property from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </summary>
+            <remarks>
+            <para>
+            Extract the value of a property from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Layout.RawPropertyLayout.#ctor">
+            <summary>
+            Constructs a RawPropertyLayout
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.RawPropertyLayout.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Lookup the property for <see cref="P:log4net.Layout.RawPropertyLayout.Key"/>
+            </summary>
+            <param name="loggingEvent">The event to format</param>
+            <returns>returns property value</returns>
+            <remarks>
+            <para>
+            Looks up and returns the object value of the property
+            named <see cref="P:log4net.Layout.RawPropertyLayout.Key"/>. If there is no property defined
+            with than name then <c>null</c> will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.RawPropertyLayout.Key">
+            <summary>
+            The name of the value to lookup in the LoggingEvent Properties collection.
+            </summary>
+            <value>
+            Value to lookup in the LoggingEvent Properties collection
+            </value>
+            <remarks>
+            <para>
+            String name of the property to lookup in the <see cref="T:log4net.Core.LoggingEvent"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.RawTimeStampLayout">
+            <summary>
+            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </summary>
+            <remarks>
+            <para>
+            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.RawTimeStampLayout.#ctor">
+            <summary>
+            Constructs a RawTimeStampLayout
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.RawTimeStampLayout.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
+            </summary>
+            <param name="loggingEvent">The event to format</param>
+            <returns>returns the time stamp</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
+            </para>
+            <para>
+            The time stamp is in local time. To format the time stamp
+            in universal time use <see cref="T:log4net.Layout.RawUtcTimeStampLayout"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.RawUtcTimeStampLayout">
+            <summary>
+            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </summary>
+            <remarks>
+            <para>
+            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.RawUtcTimeStampLayout.#ctor">
+            <summary>
+            Constructs a RawUtcTimeStampLayout
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.RawUtcTimeStampLayout.Format(log4net.Core.LoggingEvent)">
+            <summary>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
+            </summary>
+            <param name="loggingEvent">The event to format</param>
+            <returns>returns the time stamp</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
+            </para>
+            <para>
+            The time stamp is in universal time. To format the time stamp
+            in local time use <see cref="T:log4net.Layout.RawTimeStampLayout"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.SimpleLayout">
+            <summary>
+            A very simple layout
+            </summary>
+            <remarks>
+            <para>
+            SimpleLayout consists of the level of the log statement,
+            followed by " - " and then the log message itself. For example,
+            <code>
+            DEBUG - Hello world
+            </code>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.SimpleLayout.#ctor">
+            <summary>
+            Constructs a SimpleLayout
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.SimpleLayout.ActivateOptions">
+            <summary>
+            Initialize layout options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.SimpleLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Produces a simple formatted output.
+            </summary>
+            <param name="loggingEvent">the event being logged</param>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <remarks>
+            <para>
+            Formats the event as the level of the even,
+            followed by " - " and then the log message itself. The
+            output is terminated by a newline.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.XmlLayout">
+             <summary>
+             Layout that formats the log events as XML elements.
+             </summary>
+             <remarks>
+             <para>
+             The output of the <see cref="T:log4net.Layout.XmlLayout"/> consists of a series of 
+             log4net:event elements. It does not output a complete well-formed XML 
+             file. The output is designed to be included as an <em>external entity</em>
+             in a separate file to form a correct XML file.
+             </para>
+             <para>
+             For example, if <c>abc</c> is the name of the file where
+             the <see cref="T:log4net.Layout.XmlLayout"/> output goes, then a well-formed XML file would 
+             be:
+             </para>
+             <code lang="XML">
+             &lt;?xml version="1.0" ?&gt;
+             
+             &lt;!DOCTYPE log4net:events SYSTEM "log4net-events.dtd" [&lt;!ENTITY data SYSTEM "abc"&gt;]&gt;
+            
+             &lt;log4net:events version="1.2" xmlns:log4net="http://logging.apache.org/log4net/schemas/log4net-events-1.2&gt;
+                 &amp;data;
+             &lt;/log4net:events&gt;
+             </code>
+             <para>
+             This approach enforces the independence of the <see cref="T:log4net.Layout.XmlLayout"/> 
+             and the appender where it is embedded.
+             </para>
+             <para>
+             The <c>version</c> attribute helps components to correctly
+             interpret output generated by <see cref="T:log4net.Layout.XmlLayout"/>. The value of 
+             this attribute should be "1.2" for release 1.2 and later.
+             </para>
+             <para>
+             Alternatively the <c>Header</c> and <c>Footer</c> properties can be
+             configured to output the correct XML header, open tag and close tag.
+             When setting the <c>Header</c> and <c>Footer</c> properties it is essential
+             that the underlying data store not be appendable otherwise the data
+             will become invalid XML.
+             </para>
+             </remarks>
+             <author>Nicko Cadell</author>
+             <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Layout.XmlLayoutBase">
+            <summary>
+            Layout that formats the log events as XML elements.
+            </summary>
+            <remarks>
+            <para>
+            This is an abstract class that must be subclassed by an implementation 
+            to conform to a specific schema.
+            </para>
+            <para>
+            Deriving classes must implement the <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutBase.#ctor">
+            <summary>
+            Protected constructor to support subclasses
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Layout.XmlLayoutBase"/> class
+            with no location info.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutBase.#ctor(System.Boolean)">
+            <summary>
+            Protected constructor to support subclasses
+            </summary>
+            <remarks>
+            <para>
+            The <paramref name="locationInfo" /> parameter determines whether 
+            location information will be output by the layout. If 
+            <paramref name="locationInfo" /> is set to <c>true</c>, then the 
+            file name and line number of the statement at the origin of the log 
+            statement will be output. 
+            </para>
+            <para>
+            If you are embedding this layout within an SMTPAppender
+            then make sure to set the <b>LocationInfo</b> option of that 
+            appender as well.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutBase.ActivateOptions">
+            <summary>
+            Initialize layout options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutBase.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Produces a formatted string.
+            </summary>
+            <param name="loggingEvent">The event being logged.</param>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <remarks>
+            <para>
+            Format the <see cref="T:log4net.Core.LoggingEvent"/> and write it to the <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            <para>
+            This method creates an <see cref="T:System.Xml.XmlTextWriter"/> that writes to the
+            <paramref name="writer"/>. The <see cref="T:System.Xml.XmlTextWriter"/> is passed 
+            to the <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method. Subclasses should override the
+            <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method rather than this method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Does the actual writing of the XML.
+            </summary>
+            <param name="writer">The writer to use to output the event to.</param>
+            <param name="loggingEvent">The event to write.</param>
+            <remarks>
+            <para>
+            Subclasses should override this method to format
+            the <see cref="T:log4net.Core.LoggingEvent"/> as XML.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.XmlLayoutBase.m_locationInfo">
+            <summary>
+            Flag to indicate if location information should be included in
+            the XML events.
+            </summary>
+        </member>
+        <member name="F:log4net.Layout.XmlLayoutBase.m_invalidCharReplacement">
+            <summary>
+            The string to replace invalid chars with
+            </summary>
+        </member>
+        <member name="P:log4net.Layout.XmlLayoutBase.LocationInfo">
+            <summary>
+            Gets a value indicating whether to include location information in 
+            the XML events.
+            </summary>
+            <value>
+            <c>true</c> if location information should be included in the XML 
+            events; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            If <see cref="P:log4net.Layout.XmlLayoutBase.LocationInfo"/> is set to <c>true</c>, then the file 
+            name and line number of the statement at the origin of the log 
+            statement will be output. 
+            </para>
+            <para>
+            If you are embedding this layout within an <c>SMTPAppender</c>
+            then make sure to set the <b>LocationInfo</b> option of that 
+            appender as well.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement">
+            <summary>
+            The string to replace characters that can not be expressed in XML with.
+            <remarks>
+            <para>
+            Not all characters may be expressed in XML. This property contains the
+            string to replace those that can not with. This defaults to a ?. Set it
+            to the empty string to simply remove offending characters. For more
+            details on the allowed character ranges see http://www.w3.org/TR/REC-xml/#charsets
+            Character replacement will occur in  the log message, the property names 
+            and the property values.
+            </para>
+            </remarks>
+            </summary>
+        </member>
+        <member name="P:log4net.Layout.XmlLayoutBase.ContentType">
+            <summary>
+            Gets the content type output by this layout. 
+            </summary>
+            <value>
+            As this is the XML layout, the value is always <c>"text/xml"</c>.
+            </value>
+            <remarks>
+            <para>
+            As this is the XML layout, the value is always <c>"text/xml"</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayout.#ctor">
+            <summary>
+            Constructs an XmlLayout
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.XmlLayout.#ctor(System.Boolean)">
+            <summary>
+            Constructs an XmlLayout.
+            </summary>
+            <remarks>
+            <para>
+            The <b>LocationInfo</b> option takes a boolean value. By
+            default, it is set to false which means there will be no location
+            information output by this layout. If the the option is set to
+            true, then the file name and line number of the statement
+            at the origin of the log statement will be output. 
+            </para>
+            <para>
+            If you are embedding this layout within an SmtpAppender
+            then make sure to set the <b>LocationInfo</b> option of that 
+            appender as well.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayout.ActivateOptions">
+            <summary>
+            Initialize layout options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            Builds a cache of the element names
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayout.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Does the actual writing of the XML.
+            </summary>
+            <param name="writer">The writer to use to output the event to.</param>
+            <param name="loggingEvent">The event to write.</param>
+            <remarks>
+            <para>
+            Override the base class <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method
+            to write the <see cref="T:log4net.Core.LoggingEvent"/> to the <see cref="T:System.Xml.XmlWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Layout.XmlLayout.m_prefix">
+            <summary>
+            The prefix to use for all generated element names
+            </summary>
+        </member>
+        <member name="P:log4net.Layout.XmlLayout.Prefix">
+            <summary>
+            The prefix to use for all element names
+            </summary>
+            <remarks>
+            <para>
+            The default prefix is <b>log4net</b>. Set this property
+            to change the prefix. If the prefix is set to an empty string
+            then no prefix will be written.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.XmlLayout.Base64EncodeMessage">
+            <summary>
+            Set whether or not to base64 encode the message.
+            </summary>
+            <remarks>
+            <para>
+            By default the log message will be written as text to the xml
+            output. This can cause problems when the message contains binary
+            data. By setting this to true the contents of the message will be
+            base64 encoded. If this is set then invalid character replacement
+            (see <see cref="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement"/>) will not be performed
+            on the log message.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.XmlLayout.Base64EncodeProperties">
+            <summary>
+            Set whether or not to base64 encode the property values.
+            </summary>
+            <remarks>
+            <para>
+            By default the properties will be written as text to the xml
+            output. This can cause problems when one or more properties contain
+            binary data. By setting this to true the values of the properties
+            will be base64 encoded. If this is set then invalid character replacement
+            (see <see cref="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement"/>) will not be performed
+            on the property values.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Layout.XmlLayoutSchemaLog4j">
+            <summary>
+            Layout that formats the log events as XML elements compatible with the log4j schema
+            </summary>
+            <remarks>
+            <para>
+            Formats the log events according to the http://logging.apache.org/log4j schema.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Layout.XmlLayoutSchemaLog4j.s_date1970">
+            <summary>
+            The 1st of January 1970 in UTC
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.#ctor">
+            <summary>
+            Constructs an XMLLayoutSchemaLog4j
+            </summary>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.#ctor(System.Boolean)">
+            <summary>
+            Constructs an XMLLayoutSchemaLog4j.
+            </summary>
+            <remarks>
+            <para>
+            The <b>LocationInfo</b> option takes a boolean value. By
+            default, it is set to false which means there will be no location
+            information output by this layout. If the the option is set to
+            true, then the file name and line number of the statement
+            at the origin of the log statement will be output. 
+            </para>
+            <para>
+            If you are embedding this layout within an SMTPAppender
+            then make sure to set the <b>LocationInfo</b> option of that 
+            appender as well.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
+            <summary>
+            Actually do the writing of the xml
+            </summary>
+            <param name="writer">the writer to use</param>
+            <param name="loggingEvent">the event to write</param>
+            <remarks>
+            <para>
+            Generate XML that is compatible with the log4j schema.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Layout.XmlLayoutSchemaLog4j.Version">
+            <summary>
+            The version of the log4j schema to use.
+            </summary>
+            <remarks>
+            <para>
+            Only version 1.2 of the log4j schema is supported.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.ObjectRenderer.DefaultRenderer">
+            <summary>
+            The default object Renderer.
+            </summary>
+            <remarks>
+            <para>
+            The default renderer supports rendering objects and collections to strings.
+            </para>
+            <para>
+            See the <see cref="M:log4net.ObjectRenderer.DefaultRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)"/> method for details of the output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.ObjectRenderer.IObjectRenderer">
+            <summary>
+            Implement this interface in order to render objects as strings
+            </summary>
+            <remarks>
+            <para>
+            Certain types require special case conversion to
+            string form. This conversion is done by an object renderer.
+            Object renderers implement the <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>
+            interface.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.ObjectRenderer.IObjectRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)">
+            <summary>
+            Render the object <paramref name="obj"/> to a string
+            </summary>
+            <param name="rendererMap">The map used to lookup renderers</param>
+            <param name="obj">The object to render</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            Render the object <paramref name="obj"/> to a 
+            string.
+            </para>
+            <para>
+            The <paramref name="rendererMap"/> parameter is
+            provided to lookup and render other objects. This is
+            very useful where <paramref name="obj"/> contains
+            nested objects of unknown type. The <see cref="M:RendererMap.FindAndRender(object, TextWriter)"/>
+            method can be used to render these objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.DefaultRenderer.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)">
+            <summary>
+            Render the object <paramref name="obj"/> to a string
+            </summary>
+            <param name="rendererMap">The map used to lookup renderers</param>
+            <param name="obj">The object to render</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            Render the object <paramref name="obj"/> to a string.
+            </para>
+            <para>
+            The <paramref name="rendererMap"/> parameter is
+            provided to lookup and render other objects. This is
+            very useful where <paramref name="obj"/> contains
+            nested objects of unknown type. The <see cref="M:RendererMap.FindAndRender(object)"/>
+            method can be used to render these objects.
+            </para>
+            <para>
+            The default renderer supports rendering objects to strings as follows:
+            </para>
+            <list type="table">
+            	<listheader>
+            		<term>Value</term>
+            		<description>Rendered String</description>
+            	</listheader>
+            	<item>
+            		<term><c>null</c></term>
+            		<description>
+            		<para>"(null)"</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term><see cref="T:System.Array"/></term>
+            		<description>
+            		<para>
+            		For a one dimensional array this is the
+            		array type name, an open brace, followed by a comma
+            		separated list of the elements (using the appropriate
+            		renderer), followed by a close brace. 
+            		</para>
+            		<para>
+            		For example: <c>int[] {1, 2, 3}</c>.
+            		</para>
+            		<para>
+            		If the array is not one dimensional the 
+            		<c>Array.ToString()</c> is returned.
+            		</para>
+            		</description>
+            	</item>
+            	<item>
+            		<term><see cref="T:System.Collections.IEnumerable"/>, <see cref="T:System.Collections.ICollection"/> &amp; <see cref="T:System.Collections.IEnumerator"/></term>
+            		<description>
+            		<para>
+            		Rendered as an open brace, followed by a comma
+            		separated list of the elements (using the appropriate
+            		renderer), followed by a close brace.
+            		</para>
+            		<para>
+            		For example: <c>{a, b, c}</c>.
+            		</para>
+            		<para>
+            		All collection classes that implement <see cref="T:System.Collections.ICollection"/> its subclasses, 
+            		or generic equivalents all implement the <see cref="T:System.Collections.IEnumerable"/> interface.
+            		</para>
+            		</description>
+            	</item>		
+            	<item>
+            		<term><see cref="T:System.Collections.DictionaryEntry"/></term>
+            		<description>
+            		<para>
+            		Rendered as the key, an equals sign ('='), and the value (using the appropriate
+            		renderer). 
+            		</para>
+            		<para>
+            		For example: <c>key=value</c>.
+            		</para>
+            		</description>
+            	</item>		
+            	<item>
+            		<term>other</term>
+            		<description>
+            		<para><c>Object.ToString()</c></para>
+            		</description>
+            	</item>
+            </list>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderArray(log4net.ObjectRenderer.RendererMap,System.Array,System.IO.TextWriter)">
+            <summary>
+            Render the array argument into a string
+            </summary>
+            <param name="rendererMap">The map used to lookup renderers</param>
+            <param name="array">the array to render</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            For a one dimensional array this is the
+            array type name, an open brace, followed by a comma
+            separated list of the elements (using the appropriate
+            renderer), followed by a close brace. For example:
+            <c>int[] {1, 2, 3}</c>.
+            </para>
+            <para>
+            If the array is not one dimensional the 
+            <c>Array.ToString()</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderEnumerator(log4net.ObjectRenderer.RendererMap,System.Collections.IEnumerator,System.IO.TextWriter)">
+            <summary>
+            Render the enumerator argument into a string
+            </summary>
+            <param name="rendererMap">The map used to lookup renderers</param>
+            <param name="enumerator">the enumerator to render</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            Rendered as an open brace, followed by a comma
+            separated list of the elements (using the appropriate
+            renderer), followed by a close brace. For example:
+            <c>{a, b, c}</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderDictionaryEntry(log4net.ObjectRenderer.RendererMap,System.Collections.DictionaryEntry,System.IO.TextWriter)">
+            <summary>
+            Render the DictionaryEntry argument into a string
+            </summary>
+            <param name="rendererMap">The map used to lookup renderers</param>
+            <param name="entry">the DictionaryEntry to render</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            Render the key, an equals sign ('='), and the value (using the appropriate
+            renderer). For example: <c>key=value</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.ObjectRenderer.RendererMap">
+            <summary>
+            Map class objects to an <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            </summary>
+            <remarks>
+            <para>
+            Maintains a mapping between types that require special
+            rendering and the <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> that
+            is used to render them.
+            </para>
+            <para>
+            The <see cref="M:FindAndRender(object)"/> method is used to render an
+            <c>object</c> using the appropriate renderers defined in this map.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.#ctor">
+            <summary>
+            Default Constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object)">
+            <summary>
+            Render <paramref name="obj"/> using the appropriate renderer.
+            </summary>
+            <param name="obj">the object to render to a string</param>
+            <returns>the object rendered as a string</returns>
+            <remarks>
+            <para>
+            This is a convenience method used to render an object to a string.
+            The alternative method <see cref="M:FindAndRender(object,TextWriter)"/>
+            should be used when streaming output to a <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object,System.IO.TextWriter)">
+            <summary>
+            Render <paramref name="obj"/> using the appropriate renderer.
+            </summary>
+            <param name="obj">the object to render to a string</param>
+            <param name="writer">The writer to render to</param>
+            <remarks>
+            <para>
+            Find the appropriate renderer for the type of the
+            <paramref name="obj"/> parameter. This is accomplished by calling the
+            <see cref="M:Get(Type)"/> method. Once a renderer is found, it is
+            applied on the object <paramref name="obj"/> and the result is returned
+            as a <see cref="T:System.String"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.Get(System.Object)">
+            <summary>
+            Gets the renderer for the specified object type
+            </summary>
+            <param name="obj">the object to lookup the renderer for</param>
+            <returns>the renderer for <paramref name="obj"/></returns>
+            <remarks>
+            <param>
+            Gets the renderer for the specified object type.
+            </param>
+            <param>
+            Syntactic sugar method that calls <see cref="M:Get(Type)"/> 
+            with the type of the object parameter.
+            </param>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.Get(System.Type)">
+            <summary>
+            Gets the renderer for the specified type
+            </summary>
+            <param name="type">the type to lookup the renderer for</param>
+            <returns>the renderer for the specified type</returns>
+            <remarks>
+            <para>
+            Returns the renderer for the specified type.
+            If no specific renderer has been defined the
+            <see cref="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer"/> will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.SearchTypeAndInterfaces(System.Type)">
+            <summary>
+            Internal function to recursively search interfaces
+            </summary>
+            <param name="type">the type to lookup the renderer for</param>
+            <returns>the renderer for the specified type</returns>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.Clear">
+            <summary>
+            Clear the map of renderers
+            </summary>
+            <remarks>
+            <para>
+            Clear the custom renderers defined by using
+            <see cref="M:log4net.ObjectRenderer.RendererMap.Put(System.Type,log4net.ObjectRenderer.IObjectRenderer)"/>. The <see cref="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer"/>
+            cannot be removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.ObjectRenderer.RendererMap.Put(System.Type,log4net.ObjectRenderer.IObjectRenderer)">
+            <summary>
+            Register an <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> for <paramref name="typeToRender"/>. 
+            </summary>
+            <param name="typeToRender">the type that will be rendered by <paramref name="renderer"/></param>
+            <param name="renderer">the renderer for <paramref name="typeToRender"/></param>
+            <remarks>
+            <para>
+            Register an object renderer for a specific source type.
+            This renderer will be returned from a call to <see cref="M:Get(Type)"/>
+            specifying the same <paramref name="typeToRender"/> as an argument.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer">
+            <summary>
+            Get the default renderer instance
+            </summary>
+            <value>the default renderer</value>
+            <remarks>
+            <para>
+            Get the default renderer
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Plugin.IPlugin">
+            <summary>
+            Interface implemented by logger repository plugins.
+            </summary>
+            <remarks>
+            <para>
+            Plugins define additional behavior that can be associated
+            with a <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            The <see cref="T:log4net.Plugin.PluginMap"/> held by the <see cref="P:log4net.Repository.ILoggerRepository.PluginMap"/>
+            property is used to store the plugins for a repository.
+            </para>
+            <para>
+            The <c>log4net.Config.PluginAttribute</c> can be used to
+            attach plugins to repositories created using configuration
+            attributes.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Plugin.IPlugin.Attach(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Attaches the plugin to the specified <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
+            <remarks>
+            <para>
+            A plugin may only be attached to a single repository.
+            </para>
+            <para>
+            This method is called when the plugin is attached to the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.IPlugin.Shutdown">
+            <summary>
+            Is called when the plugin is to shutdown.
+            </summary>
+            <remarks>
+            <para>
+            This method is called to notify the plugin that 
+            it should stop operating and should detach from
+            the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Plugin.IPlugin.Name">
+            <summary>
+            Gets the name of the plugin.
+            </summary>
+            <value>
+            The name of the plugin.
+            </value>
+            <remarks>
+            <para>
+            Plugins are stored in the <see cref="T:log4net.Plugin.PluginMap"/>
+            keyed by name. Each plugin instance attached to a
+            repository must be a unique name.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Plugin.PluginCollection">
+            <summary>
+            A strongly-typed collection of <see cref="T:log4net.Plugin.IPlugin"/> objects.
+            </summary>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.ReadOnly(log4net.Plugin.PluginCollection)">
+            <summary>
+            Creates a read-only wrapper for a <c>PluginCollection</c> instance.
+            </summary>
+            <param name="list">list to create a readonly wrapper arround</param>
+            <returns>
+            A <c>PluginCollection</c> wrapper that is read-only.
+            </returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor">
+            <summary>
+            Initializes a new instance of the <c>PluginCollection</c> class
+            that is empty and has the default initial capacity.
+            </summary>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor(System.Int32)">
+            <summary>
+            Initializes a new instance of the <c>PluginCollection</c> class
+            that has the specified initial capacity.
+            </summary>
+            <param name="capacity">
+            The number of elements that the new <c>PluginCollection</c> is initially capable of storing.
+            </param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.PluginCollection)">
+            <summary>
+            Initializes a new instance of the <c>PluginCollection</c> class
+            that contains elements copied from the specified <c>PluginCollection</c>.
+            </summary>
+            <param name="c">The <c>PluginCollection</c> whose elements are copied to the new collection.</param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.IPlugin[])">
+            <summary>
+            Initializes a new instance of the <c>PluginCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Plugin.IPlugin"/> array.
+            </summary>
+            <param name="a">The <see cref="T:log4net.Plugin.IPlugin"/> array whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor(System.Collections.ICollection)">
+            <summary>
+            Initializes a new instance of the <c>PluginCollection</c> class
+            that contains elements copied from the specified <see cref="T:log4net.Plugin.IPlugin"/> collection.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Plugin.IPlugin"/> collection whose elements are copied to the new list.</param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.PluginCollection.Tag)">
+            <summary>
+            Allow subclasses to avoid our default constructors
+            </summary>
+            <param name="tag"></param>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.CopyTo(log4net.Plugin.IPlugin[])">
+            <summary>
+            Copies the entire <c>PluginCollection</c> to a one-dimensional
+            <see cref="T:log4net.Plugin.IPlugin"/> array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Plugin.IPlugin"/> array to copy to.</param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.CopyTo(log4net.Plugin.IPlugin[],System.Int32)">
+            <summary>
+            Copies the entire <c>PluginCollection</c> to a one-dimensional
+            <see cref="T:log4net.Plugin.IPlugin"/> array, starting at the specified index of the target array.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:log4net.Plugin.IPlugin"/> array to copy to.</param>
+            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Add(log4net.Plugin.IPlugin)">
+            <summary>
+            Adds a <see cref="T:log4net.Plugin.IPlugin"/> to the end of the <c>PluginCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to be added to the end of the <c>PluginCollection</c>.</param>
+            <returns>The index at which the value has been added.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Clear">
+            <summary>
+            Removes all elements from the <c>PluginCollection</c>.
+            </summary>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Clone">
+            <summary>
+            Creates a shallow copy of the <see cref="T:log4net.Plugin.PluginCollection"/>.
+            </summary>
+            <returns>A new <see cref="T:log4net.Plugin.PluginCollection"/> with a shallow copy of the collection data.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Contains(log4net.Plugin.IPlugin)">
+            <summary>
+            Determines whether a given <see cref="T:log4net.Plugin.IPlugin"/> is in the <c>PluginCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to check for.</param>
+            <returns><c>true</c> if <paramref name="item"/> is found in the <c>PluginCollection</c>; otherwise, <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.IndexOf(log4net.Plugin.IPlugin)">
+            <summary>
+            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Plugin.IPlugin"/>
+            in the <c>PluginCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to locate in the <c>PluginCollection</c>.</param>
+            <returns>
+            The zero-based index of the first occurrence of <paramref name="item"/> 
+            in the entire <c>PluginCollection</c>, if found; otherwise, -1.
+            </returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Insert(System.Int32,log4net.Plugin.IPlugin)">
+            <summary>
+            Inserts an element into the <c>PluginCollection</c> at the specified index.
+            </summary>
+            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
+            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to insert.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Remove(log4net.Plugin.IPlugin)">
+            <summary>
+            Removes the first occurrence of a specific <see cref="T:log4net.Plugin.IPlugin"/> from the <c>PluginCollection</c>.
+            </summary>
+            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to remove from the <c>PluginCollection</c>.</param>
+            <exception cref="T:System.ArgumentException">
+            The specified <see cref="T:log4net.Plugin.IPlugin"/> was not found in the <c>PluginCollection</c>.
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.RemoveAt(System.Int32)">
+            <summary>
+            Removes the element at the specified index of the <c>PluginCollection</c>.
+            </summary>
+            <param name="index">The zero-based index of the element to remove.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero.</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through the <c>PluginCollection</c>.
+            </summary>
+            <returns>An <see cref="T:log4net.Plugin.PluginCollection.Enumerator"/> for the entire <c>PluginCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.AddRange(log4net.Plugin.PluginCollection)">
+            <summary>
+            Adds the elements of another <c>PluginCollection</c> to the current <c>PluginCollection</c>.
+            </summary>
+            <param name="x">The <c>PluginCollection</c> whose elements should be added to the end of the current <c>PluginCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.AddRange(log4net.Plugin.IPlugin[])">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Plugin.IPlugin"/> array to the current <c>PluginCollection</c>.
+            </summary>
+            <param name="x">The <see cref="T:log4net.Plugin.IPlugin"/> array whose elements should be added to the end of the <c>PluginCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.AddRange(System.Collections.ICollection)">
+            <summary>
+            Adds the elements of a <see cref="T:log4net.Plugin.IPlugin"/> collection to the current <c>PluginCollection</c>.
+            </summary>
+            <param name="col">The <see cref="T:log4net.Plugin.IPlugin"/> collection whose elements should be added to the end of the <c>PluginCollection</c>.</param>
+            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.TrimToSize">
+            <summary>
+            Sets the capacity to the actual number of elements.
+            </summary>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.ValidateIndex(System.Int32)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero.</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.ValidateIndex(System.Int32,System.Boolean)">
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="i"/> is less than zero.</para>
+            <para>-or-</para>
+            <para><paramref name="i"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.Count">
+            <summary>
+            Gets the number of elements actually contained in the <c>PluginCollection</c>.
+            </summary>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the collection is synchronized (thread-safe).
+            </summary>
+            <returns>false, because the backing type is an array, which is never thread-safe.</returns>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the collection.
+            </summary>
+            <value>
+            An object that can be used to synchronize access to the collection.
+            </value>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.Item(System.Int32)">
+            <summary>
+            Gets or sets the <see cref="T:log4net.Plugin.IPlugin"/> at the specified index.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Plugin.IPlugin"/> at the specified index.
+            </value>
+            <param name="index">The zero-based index of the element to get or set.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            <para><paramref name="index"/> is less than zero.</para>
+            <para>-or-</para>
+            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
+            </exception>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.IsFixedSize">
+            <summary>
+            Gets a value indicating whether the collection has a fixed size.
+            </summary>
+            <value><c>true</c> if the collection has a fixed size; otherwise, <c>false</c>. The default is <c>false</c>.</value>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the IList is read-only.
+            </summary>
+            <value><c>true</c> if the collection is read-only; otherwise, <c>false</c>. The default is <c>false</c>.</value>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.Capacity">
+            <summary>
+            Gets or sets the number of elements the <c>PluginCollection</c> can contain.
+            </summary>
+            <value>
+            The number of elements the <c>PluginCollection</c> can contain.
+            </value>
+        </member>
+        <member name="T:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator">
+            <summary>
+            Supports type-safe iteration over a <see cref="T:log4net.Plugin.PluginCollection"/>.
+            </summary>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+        </member>
+        <member name="T:log4net.Plugin.PluginCollection.Tag">
+            <summary>
+            Type visible only to our subclasses
+            Used to access protected constructor
+            </summary>
+            <exclude/>
+        </member>
+        <member name="F:log4net.Plugin.PluginCollection.Tag.Default">
+            <summary>
+            A value
+            </summary>
+        </member>
+        <member name="T:log4net.Plugin.PluginCollection.Enumerator">
+            <summary>
+            Supports simple iteration over a <see cref="T:log4net.Plugin.PluginCollection"/>.
+            </summary>
+            <exclude/>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Enumerator.#ctor(log4net.Plugin.PluginCollection)">
+            <summary>
+            Initializes a new instance of the <c>Enumerator</c> class.
+            </summary>
+            <param name="tc"></param>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Enumerator.MoveNext">
+            <summary>
+            Advances the enumerator to the next element in the collection.
+            </summary>
+            <returns>
+            <c>true</c> if the enumerator was successfully advanced to the next element; 
+            <c>false</c> if the enumerator has passed the end of the collection.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            The collection was modified after the enumerator was created.
+            </exception>
+        </member>
+        <member name="M:log4net.Plugin.PluginCollection.Enumerator.Reset">
+            <summary>
+            Sets the enumerator to its initial position, before the first element in the collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Plugin.PluginCollection.Enumerator.Current">
+            <summary>
+            Gets the current element in the collection.
+            </summary>
+            <value>
+            The current element in the collection.
+            </value>
+        </member>
+        <member name="T:log4net.Plugin.PluginCollection.ReadOnlyPluginCollection">
+            <exclude/>
+        </member>
+        <member name="T:log4net.Plugin.PluginMap">
+            <summary>
+            Map of repository plugins.
+            </summary>
+            <remarks>
+            <para>
+            This class is a name keyed map of the plugins that are
+            attached to a repository.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Plugin.PluginMap.#ctor(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="repository">The repository that the plugins should be attached to.</param>
+            <remarks>
+            <para>
+            Initialize a new instance of the <see cref="T:log4net.Plugin.PluginMap"/> class with a 
+            repository that the plugins should be attached to.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.PluginMap.Add(log4net.Plugin.IPlugin)">
+            <summary>
+            Adds a <see cref="T:log4net.Plugin.IPlugin"/> to the map.
+            </summary>
+            <param name="plugin">The <see cref="T:log4net.Plugin.IPlugin"/> to add to the map.</param>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Plugin.IPlugin"/> will be attached to the repository when added.
+            </para>
+            <para>
+            If there already exists a plugin with the same name 
+            attached to the repository then the old plugin will
+            be <see cref="M:log4net.Plugin.IPlugin.Shutdown"/> and replaced with
+            the new plugin.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.PluginMap.Remove(log4net.Plugin.IPlugin)">
+            <summary>
+            Removes a <see cref="T:log4net.Plugin.IPlugin"/> from the map.
+            </summary>
+            <param name="plugin">The <see cref="T:log4net.Plugin.IPlugin"/> to remove from the map.</param>
+            <remarks>
+            <para>
+            Remove a specific plugin from this map.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Plugin.PluginMap.Item(System.String)">
+            <summary>
+            Gets a <see cref="T:log4net.Plugin.IPlugin"/> by name.
+            </summary>
+            <param name="name">The name of the <see cref="T:log4net.Plugin.IPlugin"/> to lookup.</param>
+            <returns>
+            The <see cref="T:log4net.Plugin.IPlugin"/> from the map with the name specified, or 
+            <c>null</c> if no plugin is found.
+            </returns>
+            <remarks>
+            <para>
+            Lookup a plugin by name. If the plugin is not found <c>null</c>
+            will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Plugin.PluginMap.AllPlugins">
+            <summary>
+            Gets all possible plugins as a list of <see cref="T:log4net.Plugin.IPlugin"/> objects.
+            </summary>
+            <value>All possible plugins as a list of <see cref="T:log4net.Plugin.IPlugin"/> objects.</value>
+            <remarks>
+            <para>
+            Get a collection of all the plugins defined in this map.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Plugin.PluginSkeleton">
+            <summary>
+            Base implementation of <see cref="T:log4net.Plugin.IPlugin"/>
+            </summary>
+            <remarks>
+            <para>
+            Default abstract implementation of the <see cref="T:log4net.Plugin.IPlugin"/>
+            interface. This base class can be used by implementors
+            of the <see cref="T:log4net.Plugin.IPlugin"/> interface.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Plugin.PluginSkeleton.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="name">the name of the plugin</param>
+            <remarks>
+            Initializes a new Plugin with the specified name.
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.PluginSkeleton.Attach(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Attaches this plugin to a <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
+            <remarks>
+            <para>
+            A plugin may only be attached to a single repository.
+            </para>
+            <para>
+            This method is called when the plugin is attached to the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.PluginSkeleton.Shutdown">
+            <summary>
+            Is called when the plugin is to shutdown.
+            </summary>
+            <remarks>
+            <para>
+            This method is called to notify the plugin that 
+            it should stop operating and should detach from
+            the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Plugin.PluginSkeleton.m_name">
+            <summary>
+            The name of this plugin.
+            </summary>
+        </member>
+        <member name="F:log4net.Plugin.PluginSkeleton.m_repository">
+            <summary>
+            The repository this plugin is attached to.
+            </summary>
+        </member>
+        <member name="P:log4net.Plugin.PluginSkeleton.Name">
+            <summary>
+            Gets or sets the name of the plugin.
+            </summary>
+            <value>
+            The name of the plugin.
+            </value>
+            <remarks>
+            <para>
+            Plugins are stored in the <see cref="T:log4net.Plugin.PluginMap"/>
+            keyed by name. Each plugin instance attached to a
+            repository must be a unique name.
+            </para>
+            <para>
+            The name of the plugin must not change one the 
+            plugin has been attached to a repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Plugin.PluginSkeleton.LoggerRepository">
+            <summary>
+            The repository for this plugin
+            </summary>
+            <value>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin is attached to.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin is 
+            attached to.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Plugin.RemoteLoggingServerPlugin">
+            <summary>
+            Plugin that listens for events from the <see cref="T:log4net.Appender.RemotingAppender"/>
+            </summary>
+            <remarks>
+            <para>
+            This plugin publishes an instance of <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/> 
+            on a specified <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/>. This listens for logging events delivered from
+            a remote <see cref="T:log4net.Appender.RemotingAppender"/>.
+            </para>
+            <para>
+            When an event is received it is relogged within the attached repository
+            as if it had been raised locally.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin"/> class.
+            </para>
+            <para>
+            The <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/> property must be set.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.#ctor(System.String)">
+            <summary>
+            Construct with sink Uri.
+            </summary>
+            <param name="sinkUri">The name to publish the sink under in the remoting infrastructure. 
+            See <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/> for more details.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin"/> class
+            with specified name.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.Attach(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Attaches this plugin to a <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
+            <remarks>
+            <para>
+            A plugin may only be attached to a single repository.
+            </para>
+            <para>
+            This method is called when the plugin is attached to the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.Shutdown">
+            <summary>
+            Is called when the plugin is to shutdown.
+            </summary>
+            <remarks>
+            <para>
+            When the plugin is shutdown the remote logging
+            sink is disconnected.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Plugin.RemoteLoggingServerPlugin.declaringType">
+            <summary>
+            The fully qualified type of the RemoteLoggingServerPlugin class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri">
+            <summary>
+            Gets or sets the URI of this sink.
+            </summary>
+            <value>
+            The URI of this sink.
+            </value>
+            <remarks>
+            <para>
+            This is the name under which the object is marshaled.
+            <see cref="M:RemotingServices.Marshal(MarshalByRefObject,String,Type)"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl">
+            <summary>
+            Delivers <see cref="T:log4net.Core.LoggingEvent"/> objects to a remote sink.
+            </summary>
+            <remarks>
+            <para>
+            Internal class used to listen for logging events
+            and deliver them to the local repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.#ctor(log4net.Repository.ILoggerRepository)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="repository">The repository to log to.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl"/> for the
+            specified <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.LogEvents(log4net.Core.LoggingEvent[])">
+            <summary>
+            Logs the events to the repository.
+            </summary>
+            <param name="events">The events to log.</param>
+            <remarks>
+            <para>
+            The events passed are logged to the <see cref="T:log4net.Repository.ILoggerRepository"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.InitializeLifetimeService">
+            <summary>
+            Obtains a lifetime service object to control the lifetime 
+            policy for this instance.
+            </summary>
+            <returns><c>null</c> to indicate that this instance should live forever.</returns>
+            <remarks>
+            <para>
+            Obtains a lifetime service object to control the lifetime 
+            policy for this instance. This object should live forever
+            therefore this implementation returns <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.m_repository">
+            <summary>
+            The underlying <see cref="T:log4net.Repository.ILoggerRepository"/> that events should
+            be logged to.
+            </summary>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.DefaultLoggerFactory">
+            <summary>
+            Default implementation of <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
+            </summary>
+            <remarks>
+            <para>
+            This default implementation of the <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
+            interface is used to create the default subclass
+            of the <see cref="T:log4net.Repository.Hierarchy.Logger"/> object.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.ILoggerFactory">
+            <summary>
+            Interface abstracts creation of <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances
+            </summary>
+            <remarks>
+            <para>
+            This interface is used by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to 
+            create new <see cref="T:log4net.Repository.Hierarchy.Logger"/> objects.
+            </para>
+            <para>
+            The <see cref="M:log4net.Repository.Hierarchy.ILoggerFactory.CreateLogger(log4net.Repository.ILoggerRepository,System.String)"/> method is called
+            to create a named <see cref="T:log4net.Repository.Hierarchy.Logger"/>.
+            </para>
+            <para>
+            Implement this interface to create new subclasses of <see cref="T:log4net.Repository.Hierarchy.Logger"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.ILoggerFactory.CreateLogger(log4net.Repository.ILoggerRepository,System.String)">
+            <summary>
+            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that will own the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
+            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
+            <returns>The <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance for the specified name.</returns>
+            <remarks>
+            <para>
+            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance with the 
+            specified name.
+            </para>
+            <para>
+            Called by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to create
+            new named <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances.
+            </para>
+            <para>
+            If the <paramref name="name"/> is <c>null</c> then the root logger
+            must be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory"/> class. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.CreateLogger(log4net.Repository.ILoggerRepository,System.String)">
+            <summary>
+            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance
+            </summary>
+            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that will own the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
+            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
+            <returns>The <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance for the specified name.</returns>
+            <remarks>
+            <para>
+            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance with the 
+            specified name.
+            </para>
+            <para>
+            Called by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to create
+            new named <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances.
+            </para>
+            <para>
+            If the <paramref name="name"/> is <c>null</c> then the root logger
+            must be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl">
+            <summary>
+            Default internal subclass of <see cref="T:log4net.Repository.Hierarchy.Logger"/>
+            </summary>
+            <remarks>
+            <para>
+            This subclass has no additional behavior over the
+            <see cref="T:log4net.Repository.Hierarchy.Logger"/> class but does allow instances
+            to be created.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.Logger">
+            <summary>
+            Implementation of <see cref="T:log4net.Core.ILogger"/> used by <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>
+            </summary>
+            <remarks>
+            <para>
+            Internal class used to provide implementation of <see cref="T:log4net.Core.ILogger"/>
+            interface. Applications should use <see cref="T:log4net.LogManager"/> to get
+            logger instances.
+            </para>
+            <para>
+            This is one of the central classes in the log4net implementation. One of the
+            distinctive features of log4net are hierarchical loggers and their
+            evaluation. The <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/> organizes the <see cref="T:log4net.Repository.Hierarchy.Logger"/>
+            instances into a rooted tree hierarchy.
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.Hierarchy.Logger"/> class is abstract. Only concrete subclasses of
+            <see cref="T:log4net.Repository.Hierarchy.Logger"/> can be created. The <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
+            is used to create instances of this type for the <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Aspi Havewala</author>
+            <author>Douglas de la Torre</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.#ctor(System.String)">
+            <summary>
+            This constructor created a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance and
+            sets its name.
+            </summary>
+            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
+            <remarks>
+            <para>
+            This constructor is protected and designed to be used by
+            a subclass that is not abstract.
+            </para>
+            <para>
+            Loggers are constructed by <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/> 
+            objects. See <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory"/> for the default
+            logger creator.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.AddAppender(log4net.Appender.IAppender)">
+            <summary>
+            Add <paramref name="newAppender"/> to the list of appenders of this
+            Logger instance.
+            </summary>
+            <param name="newAppender">An appender to add to this logger</param>
+            <remarks>
+            <para>
+            Add <paramref name="newAppender"/> to the list of appenders of this
+            Logger instance.
+            </para>
+            <para>
+            If <paramref name="newAppender"/> is already in the list of
+            appenders, then it won't be added again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.GetAppender(System.String)">
+            <summary>
+            Look for the appender named as <c>name</c>
+            </summary>
+            <param name="name">The name of the appender to lookup</param>
+            <returns>The appender with the name specified, or <c>null</c>.</returns>
+            <remarks>
+            <para>
+            Returns the named appender, or null if the appender is not found.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAllAppenders">
+            <summary>
+            Remove all previously added appenders from this Logger instance.
+            </summary>
+            <remarks>
+            <para>
+            Remove all previously added appenders from this Logger instance.
+            </para>
+            <para>
+            This is useful when re-reading configuration information.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAppender(log4net.Appender.IAppender)">
+            <summary>
+            Remove the appender passed as parameter form the list of appenders.
+            </summary>
+            <param name="appender">The appender to remove</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            Remove the appender passed as parameter form the list of appenders.
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAppender(System.String)">
+            <summary>
+            Remove the appender passed as parameter form the list of appenders.
+            </summary>
+            <param name="name">The name of the appender to remove</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            Remove the named appender passed as parameter form the list of appenders.
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.Log(System.Type,log4net.Core.Level,System.Object,System.Exception)">
+            <summary>
+            This generic form is intended to be used by wrappers.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="level">The level of the message to be logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Generate a logging event for the specified <paramref name="level"/> using
+            the <paramref name="message"/> and <paramref name="exception"/>.
+            </para>
+            <para>
+            This method must not throw any exception to the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.Log(log4net.Core.LoggingEvent)">
+            <summary>
+            This is the most generic printing method that is intended to be used 
+            by wrappers.
+            </summary>
+            <param name="logEvent">The event being logged.</param>
+            <remarks>
+            <para>
+            Logs the specified logging event through this logger.
+            </para>
+            <para>
+            This method must not throw any exception to the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.IsEnabledFor(log4net.Core.Level)">
+            <summary>
+            Checks if this logger is enabled for a given <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> passed as parameter.
+            </summary>
+            <param name="level">The level to check.</param>
+            <returns>
+            <c>true</c> if this logger is enabled for <c>level</c>, otherwise <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Test if this logger is going to log events of the specified <paramref name="level"/>.
+            </para>
+            <para>
+            This method must not throw any exception to the caller.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.CallAppenders(log4net.Core.LoggingEvent)">
+            <summary>
+            Deliver the <see cref="T:log4net.Core.LoggingEvent"/> to the attached appenders.
+            </summary>
+            <param name="loggingEvent">The event to log.</param>
+            <remarks>
+            <para>
+            Call the appenders in the hierarchy starting at
+            <c>this</c>. If no appenders could be found, emit a
+            warning.
+            </para>
+            <para>
+            This method calls all the appenders inherited from the
+            hierarchy circumventing any evaluation of whether to log or not
+            to log the particular log request.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.CloseNestedAppenders">
+            <summary>
+            Closes all attached appenders implementing the <see cref="T:log4net.Core.IAppenderAttachable"/> interface.
+            </summary>
+            <remarks>
+            <para>
+            Used to ensure that the appenders are correctly shutdown.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.Log(log4net.Core.Level,System.Object,System.Exception)">
+            <summary>
+            This is the most generic printing method. This generic form is intended to be used by wrappers
+            </summary>
+            <param name="level">The level of the message to be logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Generate a logging event for the specified <paramref name="level"/> using
+            the <paramref name="message"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.ForcedLog(System.Type,log4net.Core.Level,System.Object,System.Exception)">
+            <summary>
+            Creates a new logging event and logs the event without further checks.
+            </summary>
+            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
+            the stack boundary into the logging system for this call.</param>
+            <param name="level">The level of the message to be logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            Generates a logging event and delivers it to the attached
+            appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Logger.ForcedLog(log4net.Core.LoggingEvent)">
+            <summary>
+            Creates a new logging event and logs the event without further checks.
+            </summary>
+            <param name="logEvent">The event being logged.</param>
+            <remarks>
+            <para>
+            Delivers the logging event to the attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.declaringType">
+            <summary>
+            The fully qualified type of the Logger class.
+            </summary>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_name">
+            <summary>
+            The name of this logger.
+            </summary>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_level">
+            <summary>
+            The assigned level of this logger. 
+            </summary>
+            <remarks>
+            <para>
+            The <c>level</c> variable need not be 
+            assigned a value in which case it is inherited 
+            form the hierarchy.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_parent">
+            <summary>
+            The parent of this logger.
+            </summary>
+            <remarks>
+            <para>
+            The parent of this logger. 
+            All loggers have at least one ancestor which is the root logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_hierarchy">
+            <summary>
+            Loggers need to know what Hierarchy they are in.
+            </summary>
+            <remarks>
+            <para>
+            Loggers need to know what Hierarchy they are in.
+            The hierarchy that this logger is a member of is stored
+            here.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_appenderAttachedImpl">
+            <summary>
+            Helper implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
+            </summary>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_additive">
+            <summary>
+            Flag indicating if child loggers inherit their parents appenders
+            </summary>
+            <remarks>
+            <para>
+            Additivity is set to true by default, that is children inherit
+            the appenders of their ancestors by default. If this variable is
+            set to <c>false</c> then the appenders found in the
+            ancestors of this logger are not used. However, the children
+            of this logger will inherit its appenders, unless the children
+            have their additivity flag set to <c>false</c> too. See
+            the user manual for more details.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Logger.m_appenderLock">
+            <summary>
+            Lock to protect AppenderAttachedImpl variable m_appenderAttachedImpl
+            </summary>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Parent">
+            <summary>
+            Gets or sets the parent logger in the hierarchy.
+            </summary>
+            <value>
+            The parent logger in the hierarchy.
+            </value>
+            <remarks>
+            <para>
+            Part of the Composite pattern that makes the hierarchy.
+            The hierarchy is parent linked rather than child linked.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Additivity">
+            <summary>
+            Gets or sets a value indicating if child loggers inherit their parent's appenders.
+            </summary>
+            <value>
+            <c>true</c> if child loggers inherit their parent's appenders.
+            </value>
+            <remarks>
+            <para>
+            Additivity is set to <c>true</c> by default, that is children inherit
+            the appenders of their ancestors by default. If this variable is
+            set to <c>false</c> then the appenders found in the
+            ancestors of this logger are not used. However, the children
+            of this logger will inherit its appenders, unless the children
+            have their additivity flag set to <c>false</c> too. See
+            the user manual for more details.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.EffectiveLevel">
+            <summary>
+            Gets the effective level for this logger.
+            </summary>
+            <returns>The nearest level in the logger hierarchy.</returns>
+            <remarks>
+            <para>
+            Starting from this logger, searches the logger hierarchy for a
+            non-null level and returns it. Otherwise, returns the level of the
+            root logger.
+            </para>
+            <para>The Logger class is designed so that this method executes as
+            quickly as possible.</para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Hierarchy">
+            <summary>
+            Gets or sets the <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/> where this 
+            <c>Logger</c> instance is attached to.
+            </summary>
+            <value>The hierarchy that this logger belongs to.</value>
+            <remarks>
+            <para>
+            This logger must be attached to a single <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Level">
+            <summary>
+            Gets or sets the assigned <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/>, if any, for this Logger.  
+            </summary>
+            <value>
+            The <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> of this logger.
+            </value>
+            <remarks>
+            <para>
+            The assigned <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> can be <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Appenders">
+            <summary>
+            Get the appenders contained in this logger as an 
+            <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <returns>A collection of the appenders in this logger</returns>
+            <remarks>
+            <para>
+            Get the appenders contained in this logger as an 
+            <see cref="T:System.Collections.ICollection"/>. If no appenders 
+            can be found, then a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Name">
+            <summary>
+            Gets the logger name.
+            </summary>
+            <value>
+            The name of the logger.
+            </value>
+            <remarks>
+            <para>
+            The name of this logger
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Logger.Repository">
+            <summary>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
+            <c>Logger</c> instance is attached to.
+            </summary>
+            <value>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this logger belongs to.
+            </value>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
+            <c>Logger</c> instance is attached to.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl.#ctor(System.String)">
+            <summary>
+            Construct a new Logger
+            </summary>
+            <param name="name">the name of the logger</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl"/> class
+            with the specified name. 
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.LoggerCreationEventHandler">
+            <summary>
+            Delegate used to handle logger creation event notifications.
+            </summary>
+            <param name="sender">The <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> in which the <see cref="T:log4net.Repository.Hierarchy.Logger"/> has been created.</param>
+            <param name="e">The <see cref="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs"/> event args that hold the <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance that has been created.</param>
+            <remarks>
+            <para>
+            Delegate used to handle logger creation event notifications.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs">
+            <summary>
+            Provides data for the <see cref="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent"/> event.
+            </summary>
+            <remarks>
+            <para>
+            A <see cref="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent"/> event is raised every time a
+            <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> is created.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.LoggerCreationEventArgs.m_log">
+            <summary>
+            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> created
+            </summary>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.LoggerCreationEventArgs.#ctor(log4net.Repository.Hierarchy.Logger)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="log">The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs"/> event argument 
+            class,with the specified <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger">
+            <summary>
+            Gets the <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
+            </summary>
+            <value>
+            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
+            </value>
+            <remarks>
+            <para>
+            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.Hierarchy">
+            <summary>
+            Hierarchical organization of loggers
+            </summary>
+            <remarks>
+            <para>
+            <i>The casual user should not have to deal with this class
+            directly.</i>
+            </para>
+            <para>
+            This class is specialized in retrieving loggers by name and
+            also maintaining the logger hierarchy. Implements the 
+            <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
+            </para>
+            <para>
+            The structure of the logger hierarchy is maintained by the
+            <see cref="M:GetLogger(string)"/> method. The hierarchy is such that children
+            link to their parent but parents do not have any references to their
+            children. Moreover, loggers can be instantiated in any order, in
+            particular descendant before ancestor.
+            </para>
+            <para>
+            In case a descendant is created before a particular ancestor,
+            then it creates a provision node for the ancestor and adds itself
+            to the provision node. Other descendants of the same ancestor add
+            themselves to the previously created provision node.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Repository.LoggerRepositorySkeleton">
+            <summary>
+            Base implementation of <see cref="T:log4net.Repository.ILoggerRepository"/>
+            </summary>
+            <remarks>
+            <para>
+            Default abstract implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
+            </para>
+            <para>
+            Skeleton implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
+            All <see cref="T:log4net.Repository.ILoggerRepository"/> types can extend this type.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Repository.ILoggerRepository">
+            <summary>
+            Interface implemented by logger repositories.
+            </summary>
+            <remarks>
+            <para>
+            This interface is implemented by logger repositories. e.g. 
+            <see cref="N:log4net.Repository.Hierarchy"/>.
+            </para>
+            <para>
+            This interface is used by the <see cref="T:log4net.LogManager"/>
+            to obtain <see cref="T:log4net.ILog"/> interfaces.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.Exists(System.String)">
+            <summary>
+            Check if the named logger exists in the repository. If so return
+            its reference, otherwise returns <c>null</c>.
+            </summary>
+            <param name="name">The name of the logger to lookup</param>
+            <returns>The Logger object with the name specified</returns>
+            <remarks>
+            <para>
+            If the names logger exists it is returned, otherwise
+            <c>null</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.GetCurrentLoggers">
+            <summary>
+            Returns all the currently defined loggers as an Array.
+            </summary>
+            <returns>All the defined loggers</returns>
+            <remarks>
+            <para>
+            Returns all the currently defined loggers as an Array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.GetLogger(System.String)">
+            <summary>
+            Returns a named logger instance
+            </summary>
+            <param name="name">The name of the logger to retrieve</param>
+            <returns>The logger object with the name specified</returns>
+            <remarks>
+            <para>
+            Returns a named logger instance.
+            </para>
+            <para>
+            If a logger of that name already exists, then it will be
+            returned.  Otherwise, a new logger will be instantiated and
+            then linked with its existing ancestors as well as children.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.Shutdown">
+            <summary>Shutdown the repository</summary>
+            <remarks>
+            <para>
+            Shutting down a repository will <i>safely</i> close and remove
+            all appenders in all loggers including the root logger.
+            </para>
+            <para>
+            Some appenders need to be closed before the
+            application exists. Otherwise, pending logging events might be
+            lost.
+            </para>
+            <para>
+            The <see cref="M:Shutdown()"/> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.ResetConfiguration">
+            <summary>
+            Reset the repositories configuration to a default state
+            </summary>
+            <remarks>
+            <para>
+            Reset all values contained in this instance to their
+            default state.
+            </para>
+            <para>
+            Existing loggers are not removed. They are just reset.
+            </para>
+            <para>
+            This method should be used sparingly and with care as it will
+            block all logging until it is completed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.Log(log4net.Core.LoggingEvent)">
+            <summary>
+            Log the <see cref="T:log4net.Core.LoggingEvent"/> through this repository.
+            </summary>
+            <param name="logEvent">the event to log</param>
+            <remarks>
+            <para>
+            This method should not normally be used to log.
+            The <see cref="T:log4net.ILog"/> interface should be used 
+            for routine logging. This interface can be obtained
+            using the <see cref="M:log4net.LogManager.GetLogger(string)"/> method.
+            </para>
+            <para>
+            The <c>logEvent</c> is delivered to the appropriate logger and
+            that logger is then responsible for logging the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.ILoggerRepository.GetAppenders">
+            <summary>
+            Returns all the Appenders that are configured as an Array.
+            </summary>
+            <returns>All the Appenders</returns>
+            <remarks>
+            <para>
+            Returns all the Appenders that are configured as an Array.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.Name">
+            <summary>
+            The name of the repository
+            </summary>
+            <value>
+            The name of the repository
+            </value>
+            <remarks>
+            <para>
+            The name of the repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.RendererMap">
+            <summary>
+            RendererMap accesses the object renderer map for this repository.
+            </summary>
+            <value>
+            RendererMap accesses the object renderer map for this repository.
+            </value>
+            <remarks>
+            <para>
+            RendererMap accesses the object renderer map for this repository.
+            </para>
+            <para>
+            The RendererMap holds a mapping between types and
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.PluginMap">
+            <summary>
+            The plugin map for this repository.
+            </summary>
+            <value>
+            The plugin map for this repository.
+            </value>
+            <remarks>
+            <para>
+            The plugin map holds the <see cref="T:log4net.Plugin.IPlugin"/> instances
+            that have been attached to this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.LevelMap">
+            <summary>
+            Get the level map for the Repository.
+            </summary>
+            <remarks>
+            <para>
+            Get the level map for the Repository.
+            </para>
+            <para>
+            The level map defines the mappings between
+            level names and <see cref="T:log4net.Core.Level"/> objects in
+            this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.Threshold">
+            <summary>
+            The threshold for all events in this repository
+            </summary>
+            <value>
+            The threshold for all events in this repository
+            </value>
+            <remarks>
+            <para>
+            The threshold for all events in this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.Configured">
+            <summary>
+            Flag indicates if this repository has been configured.
+            </summary>
+            <value>
+            Flag indicates if this repository has been configured.
+            </value>
+            <remarks>
+            <para>
+            Flag indicates if this repository has been configured.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.ConfigurationMessages">
+            <summary>
+            Collection of internal messages captured during the most 
+            recent configuration process.
+            </summary>
+        </member>
+        <member name="E:log4net.Repository.ILoggerRepository.ShutdownEvent">
+            <summary>
+            Event to notify that the repository has been shutdown.
+            </summary>
+            <value>
+            Event to notify that the repository has been shutdown.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository has been shutdown.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Repository.ILoggerRepository.ConfigurationReset">
+            <summary>
+            Event to notify that the repository has had its configuration reset.
+            </summary>
+            <value>
+            Event to notify that the repository has had its configuration reset.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository's configuration has been
+            reset to default.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Repository.ILoggerRepository.ConfigurationChanged">
+            <summary>
+            Event to notify that the repository has had its configuration changed.
+            </summary>
+            <value>
+            Event to notify that the repository has had its configuration changed.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository's configuration has been changed.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.ILoggerRepository.Properties">
+            <summary>
+            Repository specific properties
+            </summary>
+            <value>
+            Repository specific properties
+            </value>
+            <remarks>
+            <para>
+            These properties can be specified on a repository specific basis.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.#ctor">
+            <summary>
+            Default Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes the repository with default (empty) properties.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.#ctor(log4net.Util.PropertiesDictionary)">
+            <summary>
+            Construct the repository using specific properties
+            </summary>
+            <param name="properties">the properties to set for this repository</param>
+            <remarks>
+            <para>
+            Initializes the repository with specified properties.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Exists(System.String)">
+            <summary>
+            Test if logger exists
+            </summary>
+            <param name="name">The name of the logger to lookup</param>
+            <returns>The Logger object with the name specified</returns>
+            <remarks>
+            <para>
+            Check if the named logger exists in the repository. If so return
+            its reference, otherwise returns <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetCurrentLoggers">
+            <summary>
+            Returns all the currently defined loggers in the repository
+            </summary>
+            <returns>All the defined loggers</returns>
+            <remarks>
+            <para>
+            Returns all the currently defined loggers in the repository as an Array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetLogger(System.String)">
+            <summary>
+            Return a new logger instance
+            </summary>
+            <param name="name">The name of the logger to retrieve</param>
+            <returns>The logger object with the name specified</returns>
+            <remarks>
+            <para>
+            Return a new logger instance.
+            </para>
+            <para>
+            If a logger of that name already exists, then it will be
+            returned. Otherwise, a new logger will be instantiated and
+            then linked with its existing ancestors as well as children.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Shutdown">
+            <summary>
+            Shutdown the repository
+            </summary>
+            <remarks>
+            <para>
+            Shutdown the repository. Can be overridden in a subclass.
+            This base class implementation notifies the <see cref="E:log4net.Repository.LoggerRepositorySkeleton.ShutdownEvent"/>
+            listeners and all attached plugins of the shutdown event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.ResetConfiguration">
+            <summary>
+            Reset the repositories configuration to a default state
+            </summary>
+            <remarks>
+            <para>
+            Reset all values contained in this instance to their
+            default state.
+            </para>
+            <para>
+            Existing loggers are not removed. They are just reset.
+            </para>
+            <para>
+            This method should be used sparingly and with care as it will
+            block all logging until it is completed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Log(log4net.Core.LoggingEvent)">
+            <summary>
+            Log the logEvent through this repository.
+            </summary>
+            <param name="logEvent">the event to log</param>
+            <remarks>
+            <para>
+            This method should not normally be used to log.
+            The <see cref="T:log4net.ILog"/> interface should be used 
+            for routine logging. This interface can be obtained
+            using the <see cref="M:log4net.LogManager.GetLogger(string)"/> method.
+            </para>
+            <para>
+            The <c>logEvent</c> is delivered to the appropriate logger and
+            that logger is then responsible for logging the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetAppenders">
+            <summary>
+            Returns all the Appenders that are configured as an Array.
+            </summary>
+            <returns>All the Appenders</returns>
+            <remarks>
+            <para>
+            Returns all the Appenders that are configured as an Array.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.LoggerRepositorySkeleton.declaringType">
+            <summary>
+            The fully qualified type of the LoggerRepositorySkeleton class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.AddRenderer(System.Type,log4net.ObjectRenderer.IObjectRenderer)">
+            <summary>
+            Adds an object renderer for a specific class. 
+            </summary>
+            <param name="typeToRender">The type that will be rendered by the renderer supplied.</param>
+            <param name="rendererInstance">The object renderer used to render the object.</param>
+            <remarks>
+            <para>
+            Adds an object renderer for a specific class. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnShutdown(System.EventArgs)">
+            <summary>
+            Notify the registered listeners that the repository is shutting down
+            </summary>
+            <param name="e">Empty EventArgs</param>
+            <remarks>
+            <para>
+            Notify any listeners that this repository is shutting down.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnConfigurationReset(System.EventArgs)">
+            <summary>
+            Notify the registered listeners that the repository has had its configuration reset
+            </summary>
+            <param name="e">Empty EventArgs</param>
+            <remarks>
+            <para>
+            Notify any listeners that this repository's configuration has been reset.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnConfigurationChanged(System.EventArgs)">
+            <summary>
+            Notify the registered listeners that the repository has had its configuration changed
+            </summary>
+            <param name="e">Empty EventArgs</param>
+            <remarks>
+            <para>
+            Notify any listeners that this repository's configuration has changed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.RaiseConfigurationChanged(System.EventArgs)">
+            <summary>
+            Raise a configuration changed event on this repository
+            </summary>
+            <param name="e">EventArgs.Empty</param>
+            <remarks>
+            <para>
+            Applications that programmatically change the configuration of the repository should
+            raise this event notification to notify listeners.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Flush(System.Int32)">
+            <summary>
+            Flushes all configured Appenders that implement <see cref="T:log4net.Appender.IFlushable"/>.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time in milliseconds to wait for logging events from asycnhronous appenders to be flushed,
+            or <see cref="F:System.Threading.Timeout.Infinite"/> to wait indefinitely.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Name">
+            <summary>
+            The name of the repository
+            </summary>
+            <value>
+            The string name of the repository
+            </value>
+            <remarks>
+            <para>
+            The name of this repository. The name is
+            used to store and lookup the repositories 
+            stored by the <see cref="T:log4net.Core.IRepositorySelector"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Threshold">
+            <summary>
+            The threshold for all events in this repository
+            </summary>
+            <value>
+            The threshold for all events in this repository
+            </value>
+            <remarks>
+            <para>
+            The threshold for all events in this repository
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.RendererMap">
+            <summary>
+            RendererMap accesses the object renderer map for this repository.
+            </summary>
+            <value>
+            RendererMap accesses the object renderer map for this repository.
+            </value>
+            <remarks>
+            <para>
+            RendererMap accesses the object renderer map for this repository.
+            </para>
+            <para>
+            The RendererMap holds a mapping between types and
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> objects.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.PluginMap">
+            <summary>
+            The plugin map for this repository.
+            </summary>
+            <value>
+            The plugin map for this repository.
+            </value>
+            <remarks>
+            <para>
+            The plugin map holds the <see cref="T:log4net.Plugin.IPlugin"/> instances
+            that have been attached to this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.LevelMap">
+            <summary>
+            Get the level map for the Repository.
+            </summary>
+            <remarks>
+            <para>
+            Get the level map for the Repository.
+            </para>
+            <para>
+            The level map defines the mappings between
+            level names and <see cref="T:log4net.Core.Level"/> objects in
+            this repository.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Configured">
+            <summary>
+            Flag indicates if this repository has been configured.
+            </summary>
+            <value>
+            Flag indicates if this repository has been configured.
+            </value>
+            <remarks>
+            <para>
+            Flag indicates if this repository has been configured.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.ConfigurationMessages">
+            <summary>
+            Contains a list of internal messages captures during the 
+            last configuration.
+            </summary>
+        </member>
+        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ShutdownEvent">
+            <summary>
+            Event to notify that the repository has been shutdown.
+            </summary>
+            <value>
+            Event to notify that the repository has been shutdown.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository has been shutdown.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ConfigurationReset">
+            <summary>
+            Event to notify that the repository has had its configuration reset.
+            </summary>
+            <value>
+            Event to notify that the repository has had its configuration reset.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository's configuration has been
+            reset to default.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ConfigurationChanged">
+            <summary>
+            Event to notify that the repository has had its configuration changed.
+            </summary>
+            <value>
+            Event to notify that the repository has had its configuration changed.
+            </value>
+            <remarks>
+            <para>
+            Event raised when the repository's configuration has been changed.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Properties">
+            <summary>
+            Repository specific properties
+            </summary>
+            <value>
+            Repository specific properties
+            </value>
+            <remarks>
+            These properties can be specified on a repository specific basis
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.IBasicRepositoryConfigurator">
+            <summary>
+            Basic Configurator interface for repositories
+            </summary>
+            <remarks>
+            <para>
+            Interface used by basic configurator to configure a <see cref="T:log4net.Repository.ILoggerRepository"/>
+            with a default <see cref="T:log4net.Appender.IAppender"/>.
+            </para>
+            <para>
+            A <see cref="T:log4net.Repository.ILoggerRepository"/> should implement this interface to support
+            configuration by the <see cref="T:log4net.Config.BasicConfigurator"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.IBasicRepositoryConfigurator.Configure(log4net.Appender.IAppender)">
+            <summary>
+            Initialize the repository using the specified appender
+            </summary>
+            <param name="appender">the appender to use to log all logging events</param>
+            <remarks>
+            <para>
+            Configure the repository to route all logging events to the
+            specified appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.IBasicRepositoryConfigurator.Configure(log4net.Appender.IAppender[])">
+            <summary>
+            Initialize the repository using the specified appenders
+            </summary>
+            <param name="appenders">the appenders to use to log all logging events</param>
+            <remarks>
+            <para>
+            Configure the repository to route all logging events to the
+            specified appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.IXmlRepositoryConfigurator">
+            <summary>
+            Configure repository using XML
+            </summary>
+            <remarks>
+            <para>
+            Interface used by Xml configurator to configure a <see cref="T:log4net.Repository.ILoggerRepository"/>.
+            </para>
+            <para>
+            A <see cref="T:log4net.Repository.ILoggerRepository"/> should implement this interface to support
+            configuration by the <see cref="T:log4net.Config.XmlConfigurator"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.IXmlRepositoryConfigurator.Configure(System.Xml.XmlElement)">
+            <summary>
+            Initialize the repository using the specified config
+            </summary>
+            <param name="element">the element containing the root of the config</param>
+            <remarks>
+            <para>
+            The schema for the XML configuration data is defined by
+            the implementation.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Util.PropertiesDictionary)">
+            <summary>
+            Construct with properties
+            </summary>
+            <param name="properties">The properties to pass to this repository.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Repository.Hierarchy.ILoggerFactory)">
+            <summary>
+            Construct with a logger factory
+            </summary>
+            <param name="loggerFactory">The factory to use to create new logger instances.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class with 
+            the specified <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Util.PropertiesDictionary,log4net.Repository.Hierarchy.ILoggerFactory)">
+            <summary>
+            Construct with properties and a logger factory
+            </summary>
+            <param name="properties">The properties to pass to this repository.</param>
+            <param name="loggerFactory">The factory to use to create new logger instances.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class with 
+            the specified <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Exists(System.String)">
+            <summary>
+            Test if a logger exists
+            </summary>
+            <param name="name">The name of the logger to lookup</param>
+            <returns>The Logger object with the name specified</returns>
+            <remarks>
+            <para>
+            Check if the named logger exists in the hierarchy. If so return
+            its reference, otherwise returns <c>null</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetCurrentLoggers">
+            <summary>
+            Returns all the currently defined loggers in the hierarchy as an Array
+            </summary>
+            <returns>All the defined loggers</returns>
+            <remarks>
+            <para>
+            Returns all the currently defined loggers in the hierarchy as an Array.
+            The root logger is <b>not</b> included in the returned
+            enumeration.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetLogger(System.String)">
+            <summary>
+            Return a new logger instance named as the first parameter using
+            the default factory.
+            </summary>
+            <remarks>
+            <para>
+            Return a new logger instance named as the first parameter using
+            the default factory.
+            </para>
+            <para>
+            If a logger of that name already exists, then it will be
+            returned.  Otherwise, a new logger will be instantiated and
+            then linked with its existing ancestors as well as children.
+            </para>
+            </remarks>
+            <param name="name">The name of the logger to retrieve</param>
+            <returns>The logger object with the name specified</returns>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Shutdown">
+            <summary>
+            Shutting down a hierarchy will <i>safely</i> close and remove
+            all appenders in all loggers including the root logger.
+            </summary>
+            <remarks>
+            <para>
+            Shutting down a hierarchy will <i>safely</i> close and remove
+            all appenders in all loggers including the root logger.
+            </para>
+            <para>
+            Some appenders need to be closed before the
+            application exists. Otherwise, pending logging events might be
+            lost.
+            </para>
+            <para>
+            The <c>Shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.ResetConfiguration">
+            <summary>
+            Reset all values contained in this hierarchy instance to their default.
+            </summary>
+            <remarks>
+            <para>
+            Reset all values contained in this hierarchy instance to their
+            default.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set its default "off" value.
+            </para>
+            <para>
+            Existing loggers are not removed. They are just reset.
+            </para>
+            <para>
+            This method should be used sparingly and with care as it will
+            block all logging until it is completed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Log(log4net.Core.LoggingEvent)">
+            <summary>
+            Log the logEvent through this hierarchy.
+            </summary>
+            <param name="logEvent">the event to log</param>
+            <remarks>
+            <para>
+            This method should not normally be used to log.
+            The <see cref="T:log4net.ILog"/> interface should be used 
+            for routine logging. This interface can be obtained
+            using the <see cref="M:log4net.LogManager.GetLogger(string)"/> method.
+            </para>
+            <para>
+            The <c>logEvent</c> is delivered to the appropriate logger and
+            that logger is then responsible for logging the event.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetAppenders">
+            <summary>
+            Returns all the Appenders that are currently configured
+            </summary>
+            <returns>An array containing all the currently configured appenders</returns>
+            <remarks>
+            <para>
+            Returns all the <see cref="T:log4net.Appender.IAppender"/> instances that are currently configured.
+            All the loggers are searched for appenders. The appenders may also be containers
+            for appenders and these are also searched for additional loggers.
+            </para>
+            <para>
+            The list returned is unordered but does not contain duplicates.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.CollectAppender(System.Collections.ArrayList,log4net.Appender.IAppender)">
+            <summary>
+            Collect the appenders from an <see cref="T:log4net.Core.IAppenderAttachable"/>.
+            The appender may also be a container.
+            </summary>
+            <param name="appenderList"></param>
+            <param name="appender"></param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.CollectAppenders(System.Collections.ArrayList,log4net.Core.IAppenderAttachable)">
+            <summary>
+            Collect the appenders from an <see cref="T:log4net.Core.IAppenderAttachable"/> container
+            </summary>
+            <param name="appenderList"></param>
+            <param name="container"></param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.log4net#Repository#IBasicRepositoryConfigurator#Configure(log4net.Appender.IAppender)">
+            <summary>
+            Initialize the log4net system using the specified appender
+            </summary>
+            <param name="appender">the appender to use to log all logging events</param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.log4net#Repository#IBasicRepositoryConfigurator#Configure(log4net.Appender.IAppender[])">
+            <summary>
+            Initialize the log4net system using the specified appenders
+            </summary>
+            <param name="appenders">the appenders to use to log all logging events</param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.BasicRepositoryConfigure(log4net.Appender.IAppender[])">
+            <summary>
+            Initialize the log4net system using the specified appenders
+            </summary>
+            <param name="appenders">the appenders to use to log all logging events</param>
+            <remarks>
+            <para>
+            This method provides the same functionality as the 
+            <see cref="M:IBasicRepositoryConfigurator.Configure(IAppender)"/> method implemented
+            on this object, but it is protected and therefore can be called by subclasses.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.log4net#Repository#IXmlRepositoryConfigurator#Configure(System.Xml.XmlElement)">
+            <summary>
+            Initialize the log4net system using the specified config
+            </summary>
+            <param name="element">the element containing the root of the config</param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.XmlRepositoryConfigure(System.Xml.XmlElement)">
+            <summary>
+            Initialize the log4net system using the specified config
+            </summary>
+            <param name="element">the element containing the root of the config</param>
+            <remarks>
+            <para>
+            This method provides the same functionality as the 
+            <see cref="M:IBasicRepositoryConfigurator.Configure(IAppender)"/> method implemented
+            on this object, but it is protected and therefore can be called by subclasses.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.IsDisabled(log4net.Core.Level)">
+            <summary>
+            Test if this hierarchy is disabled for the specified <see cref="T:log4net.Core.Level"/>.
+            </summary>
+            <param name="level">The level to check against.</param>
+            <returns>
+            <c>true</c> if the repository is disabled for the level argument, <c>false</c> otherwise.
+            </returns>
+            <remarks>
+            <para>
+            If this hierarchy has not been configured then this method will
+            always return <c>true</c>.
+            </para>
+            <para>
+            This method will return <c>true</c> if this repository is
+            disabled for <c>level</c> object passed as parameter and
+            <c>false</c> otherwise.
+            </para>
+            <para>
+            See also the <see cref="P:log4net.Repository.ILoggerRepository.Threshold"/> property.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Clear">
+            <summary>
+            Clear all logger definitions from the internal hashtable
+            </summary>
+            <remarks>
+            <para>
+            This call will clear all logger definitions from the internal
+            hashtable. Invoking this method will irrevocably mess up the
+            logger hierarchy.
+            </para>
+            <para>
+            You should <b>really</b> know what you are doing before
+            invoking this method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetLogger(System.String,log4net.Repository.Hierarchy.ILoggerFactory)">
+            <summary>
+            Return a new logger instance named as the first parameter using
+            <paramref name="factory"/>.
+            </summary>
+            <param name="name">The name of the logger to retrieve</param>
+            <param name="factory">The factory that will make the new logger instance</param>
+            <returns>The logger object with the name specified</returns>
+            <remarks>
+            <para>
+            If a logger of that name already exists, then it will be
+            returned. Otherwise, a new logger will be instantiated by the
+            <paramref name="factory"/> parameter and linked with its existing
+            ancestors as well as children.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.OnLoggerCreationEvent(log4net.Repository.Hierarchy.Logger)">
+            <summary>
+            Sends a logger creation event to all registered listeners
+            </summary>
+            <param name="logger">The newly created logger</param>
+            <remarks>
+            Raises the logger creation event.
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.UpdateParents(log4net.Repository.Hierarchy.Logger)">
+            <summary>
+            Updates all the parents of the specified logger
+            </summary>
+            <param name="log">The logger to update the parents for</param>
+            <remarks>
+            <para>
+            This method loops through all the <i>potential</i> parents of
+            <paramref name="log"/>. There 3 possible cases:
+            </para>
+            <list type="number">
+            	<item>
+            		<term>No entry for the potential parent of <paramref name="log"/> exists</term>
+            		<description>
+            		We create a ProvisionNode for this potential 
+            		parent and insert <paramref name="log"/> in that provision node.
+            		</description>
+            	</item>
+            	<item>
+            		<term>The entry is of type Logger for the potential parent.</term>
+            		<description>
+            		The entry is <paramref name="log"/>'s nearest existing parent. We 
+            		update <paramref name="log"/>'s parent field with this entry. We also break from 
+            		he loop because updating our parent's parent is our parent's 
+            		responsibility.
+            		</description>
+            	</item>
+            	<item>
+            		<term>The entry is of type ProvisionNode for this potential parent.</term>
+            		<description>
+            		We add <paramref name="log"/> to the list of children for this 
+            		potential parent.
+            		</description>
+            	</item>
+            </list>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.UpdateChildren(log4net.Repository.Hierarchy.ProvisionNode,log4net.Repository.Hierarchy.Logger)">
+            <summary>
+            Replace a <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> with a <see cref="T:log4net.Repository.Hierarchy.Logger"/> in the hierarchy.
+            </summary>
+            <param name="pn"></param>
+            <param name="log"></param>
+            <remarks>
+            <para>
+            We update the links for all the children that placed themselves
+            in the provision node 'pn'. The second argument 'log' is a
+            reference for the newly created Logger, parent of all the
+            children in 'pn'.
+            </para>
+            <para>
+            We loop on all the children 'c' in 'pn'.
+            </para>
+            <para>
+            If the child 'c' has been already linked to a child of
+            'log' then there is no need to update 'c'.
+            </para>
+            <para>
+            Otherwise, we set log's parent field to c's parent and set
+            c's parent field to log.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.AddLevel(log4net.Repository.Hierarchy.Hierarchy.LevelEntry)">
+            <summary>
+            Define or redefine a Level using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
+            </summary>
+            <param name="levelEntry">the level values</param>
+            <remarks>
+            <para>
+            Define or redefine a Level using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
+            </para>
+            <para>
+            Supports setting levels via the configuration file.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.AddProperty(log4net.Util.PropertyEntry)">
+            <summary>
+            Set a Property using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
+            </summary>
+            <param name="propertyEntry">the property value</param>
+            <remarks>
+            <para>
+            Set a Property using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument.
+            </para>
+            <para>
+            Supports setting property values via the configuration file.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.Hierarchy.declaringType">
+            <summary>
+            The fully qualified type of the Hierarchy class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent">
+            <summary>
+            Event used to notify that a logger has been created.
+            </summary>
+            <remarks>
+            <para>
+            Event raised when a logger is created.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.EmittedNoAppenderWarning">
+            <summary>
+            Has no appender warning been emitted
+            </summary>
+            <remarks>
+            <para>
+            Flag to indicate if we have already issued a warning
+            about not having an appender warning.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.Root">
+            <summary>
+            Get the root of this hierarchy
+            </summary>
+            <remarks>
+            <para>
+            Get the root of this hierarchy.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LoggerFactory">
+            <summary>
+            Gets or sets the default <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/> instance.
+            </summary>
+            <value>The default <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/></value>
+            <remarks>
+            <para>
+            The logger factory is used to create logger instances.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry">
+            <summary>
+            A class to hold the value, name and display name for a level
+            </summary>
+            <remarks>
+            <para>
+            A class to hold the value, name and display name for a level
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.ToString">
+            <summary>
+            Override <c>Object.ToString</c> to return sensible debug info
+            </summary>
+            <returns>string info about this object</returns>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.Value">
+            <summary>
+            Value of the level
+            </summary>
+            <remarks>
+            <para>
+            If the value is not set (defaults to -1) the value will be looked
+            up for the current level with the same name.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.Name">
+            <summary>
+            Name of the level
+            </summary>
+            <value>
+            The name of the level
+            </value>
+            <remarks>
+            <para>
+            The name of the level.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.DisplayName">
+            <summary>
+            Display name for the level
+            </summary>
+            <value>
+            The display name of the level
+            </value>
+            <remarks>
+            <para>
+            The display name of the level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.LoggerKey">
+            <summary>
+            Used internally to accelerate hash table searches.
+            </summary>
+            <remarks>
+            <para>
+            Internal class used to improve performance of 
+            string keyed hashtables.
+            </para>
+            <para>
+            The hashcode of the string is cached for reuse.
+            The string is stored as an interned value.
+            When comparing two <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> objects for equality 
+            the reference equality of the interned strings is compared.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.LoggerKey.#ctor(System.String)">
+            <summary>
+            Construct key with string name
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> class 
+            with the specified name.
+            </para>
+            <para>
+            Stores the hashcode of the string and interns
+            the string key to optimize comparisons.
+            </para>
+            <note>
+            The Compact Framework 1.0 the <see cref="M:System.String.Intern(System.String)"/>
+            method does not work. On the Compact Framework
+            the string keys are not interned nor are they
+            compared by reference.
+            </note>
+            </remarks>
+            <param name="name">The name of the logger.</param>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.LoggerKey.GetHashCode">
+            <summary>
+            Returns a hash code for the current instance.
+            </summary>
+            <returns>A hash code for the current instance.</returns>
+            <remarks>
+            <para>
+            Returns the cached hashcode.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.LoggerKey.Equals(System.Object)">
+            <summary>
+            Determines whether two <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> instances 
+            are equal.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/>.</param>
+            <returns>
+            <c>true</c> if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/>; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            <para>
+            Compares the references of the interned strings.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.ProvisionNode">
+            <summary>
+            Provision nodes are used where no logger instance has been specified
+            </summary>
+            <remarks>
+            <para>
+            <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> instances are used in the 
+            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> when there is no specified 
+            <see cref="T:log4net.Repository.Hierarchy.Logger"/> for that node.
+            </para>
+            <para>
+            A provision node holds a list of child loggers on behalf of
+            a logger that does not exist.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.ProvisionNode.#ctor(log4net.Repository.Hierarchy.Logger)">
+            <summary>
+            Create a new provision node with child node
+            </summary>
+            <param name="log">A child logger to add to this node.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> class 
+            with the specified child logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.RootLogger">
+            <summary>
+            The <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> sits at the root of the logger hierarchy tree. 
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> is a regular <see cref="T:log4net.Repository.Hierarchy.Logger"/> except 
+            that it provides several guarantees.
+            </para>
+            <para>
+            First, it cannot be assigned a <c>null</c>
+            level. Second, since the root logger cannot have a parent, the
+            <see cref="P:log4net.Repository.Hierarchy.RootLogger.EffectiveLevel"/> property always returns the value of the
+            level field without walking the hierarchy.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.RootLogger.#ctor(log4net.Core.Level)">
+            <summary>
+            Construct a <see cref="T:log4net.Repository.Hierarchy.RootLogger"/>
+            </summary>
+            <param name="level">The level to assign to the root logger.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> class with
+            the specified logging level.
+            </para>
+            <para>
+            The root logger names itself as "root". However, the root
+            logger cannot be retrieved by name.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.RootLogger.declaringType">
+            <summary>
+            The fully qualified type of the RootLogger class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.RootLogger.EffectiveLevel">
+            <summary>
+            Gets the assigned level value without walking the logger hierarchy.
+            </summary>
+            <value>The assigned level value without walking the logger hierarchy.</value>
+            <remarks>
+            <para>
+            Because the root logger cannot have a parent and its level
+            must not be <c>null</c> this property just returns the
+            value of <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Repository.Hierarchy.RootLogger.Level">
+            <summary>
+            Gets or sets the assigned <see cref="P:log4net.Repository.Hierarchy.RootLogger.Level"/> for the root logger.  
+            </summary>
+            <value>
+            The <see cref="P:log4net.Repository.Hierarchy.RootLogger.Level"/> of the root logger.
+            </value>
+            <remarks>
+            <para>
+            Setting the level of the root logger to a <c>null</c> reference
+            may have catastrophic results. We prevent this here.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.Hierarchy.XmlHierarchyConfigurator">
+            <summary>
+            Initializes the log4net environment using an XML DOM.
+            </summary>
+            <remarks>
+            <para>
+            Configures a <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> using an XML DOM.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.#ctor(log4net.Repository.Hierarchy.Hierarchy)">
+            <summary>
+            Construct the configurator for a hierarchy
+            </summary>
+            <param name="hierarchy">The hierarchy to build.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.XmlHierarchyConfigurator"/> class
+            with the specified <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.Configure(System.Xml.XmlElement)">
+            <summary>
+            Configure the hierarchy by parsing a DOM tree of XML elements.
+            </summary>
+            <param name="element">The root element to parse.</param>
+            <remarks>
+            <para>
+            Configure the hierarchy by parsing a DOM tree of XML elements.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.FindAppenderByReference(System.Xml.XmlElement)">
+            <summary>
+            Parse appenders by IDREF.
+            </summary>
+            <param name="appenderRef">The appender ref element.</param>
+            <returns>The instance of the appender that the ref refers to.</returns>
+            <remarks>
+            <para>
+            Parse an XML element that represents an appender and return 
+            the appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseAppender(System.Xml.XmlElement)">
+            <summary>
+            Parses an appender element.
+            </summary>
+            <param name="appenderElement">The appender element.</param>
+            <returns>The appender instance or <c>null</c> when parsing failed.</returns>
+            <remarks>
+            <para>
+            Parse an XML element that represents an appender and return
+            the appender instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseLogger(System.Xml.XmlElement)">
+            <summary>
+            Parses a logger element.
+            </summary>
+            <param name="loggerElement">The logger element.</param>
+            <remarks>
+            <para>
+            Parse an XML element that represents a logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseRoot(System.Xml.XmlElement)">
+            <summary>
+            Parses the root logger element.
+            </summary>
+            <param name="rootElement">The root element.</param>
+            <remarks>
+            <para>
+            Parse an XML element that represents the root logger.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseChildrenOfLoggerElement(System.Xml.XmlElement,log4net.Repository.Hierarchy.Logger,System.Boolean)">
+            <summary>
+            Parses the children of a logger element.
+            </summary>
+            <param name="catElement">The category element.</param>
+            <param name="log">The logger instance.</param>
+            <param name="isRoot">Flag to indicate if the logger is the root logger.</param>
+            <remarks>
+            <para>
+            Parse the child elements of a &lt;logger&gt; element.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseRenderer(System.Xml.XmlElement)">
+            <summary>
+            Parses an object renderer.
+            </summary>
+            <param name="element">The renderer element.</param>
+            <remarks>
+            <para>
+            Parse an XML element that represents a renderer.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseLevel(System.Xml.XmlElement,log4net.Repository.Hierarchy.Logger,System.Boolean)">
+            <summary>
+            Parses a level element.
+            </summary>
+            <param name="element">The level element.</param>
+            <param name="log">The logger object to set the level on.</param>
+            <param name="isRoot">Flag to indicate if the logger is the root logger.</param>
+            <remarks>
+            <para>
+            Parse an XML element that represents a level.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.SetParameter(System.Xml.XmlElement,System.Object)">
+            <summary>
+            Sets a parameter on an object.
+            </summary>
+            <param name="element">The parameter element.</param>
+            <param name="target">The object to set the parameter on.</param>
+            <remarks>
+            The parameter name must correspond to a writable property
+            on the object. The value of the parameter is a string,
+            therefore this function will attempt to set a string
+            property first. If unable to set a string property it
+            will inspect the property and its argument type. It will
+            attempt to call a static method called <c>Parse</c> on the
+            type of the property. This method will take a single
+            string argument and return a value that can be used to
+            set the property.
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.HasAttributesOrElements(System.Xml.XmlElement)">
+            <summary>
+            Test if an element has no attributes or child elements
+            </summary>
+            <param name="element">the element to inspect</param>
+            <returns><c>true</c> if the element has any attributes or child elements, <c>false</c> otherwise</returns>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.IsTypeConstructible(System.Type)">
+            <summary>
+            Test if a <see cref="T:System.Type"/> is constructible with <c>Activator.CreateInstance</c>.
+            </summary>
+            <param name="type">the type to inspect</param>
+            <returns><c>true</c> if the type is creatable using a default constructor, <c>false</c> otherwise</returns>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.FindMethodInfo(System.Type,System.String)">
+            <summary>
+            Look for a method on the <paramref name="targetType"/> that matches the <paramref name="name"/> supplied
+            </summary>
+            <param name="targetType">the type that has the method</param>
+            <param name="name">the name of the method</param>
+            <returns>the method info found</returns>
+            <remarks>
+            <para>
+            The method must be a public instance method on the <paramref name="targetType"/>.
+            The method must be named <paramref name="name"/> or "Add" followed by <paramref name="name"/>.
+            The method must take a single parameter.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ConvertStringTo(System.Type,System.String)">
+            <summary>
+            Converts a string value to a target type.
+            </summary>
+            <param name="type">The type of object to convert the string to.</param>
+            <param name="value">The string value to use as the value of the object.</param>
+            <returns>
+            <para>
+            An object of type <paramref name="type"/> with value <paramref name="value"/> or 
+            <c>null</c> when the conversion could not be performed.
+            </para>
+            </returns>
+        </member>
+        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.CreateObjectFromXml(System.Xml.XmlElement,System.Type,System.Type)">
+            <summary>
+            Creates an object as specified in XML.
+            </summary>
+            <param name="element">The XML element that contains the definition of the object.</param>
+            <param name="defaultTargetType">The object type to use if not explicitly specified.</param>
+            <param name="typeConstraint">The type that the returned object must be or must inherit from.</param>
+            <returns>The object or <c>null</c></returns>
+            <remarks>
+            <para>
+            Parse an XML element and create an object instance based on the configuration
+            data.
+            </para>
+            <para>
+            The type of the instance may be specified in the XML. If not
+            specified then the <paramref name="defaultTargetType"/> is used
+            as the type. However the type is specified it must support the
+            <paramref name="typeConstraint"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.m_appenderBag">
+            <summary>
+            key: appenderName, value: appender.
+            </summary>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.m_hierarchy">
+            <summary>
+            The Hierarchy being configured.
+            </summary>
+        </member>
+        <member name="F:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.declaringType">
+            <summary>
+            The fully qualified type of the XmlHierarchyConfigurator class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.ConfigurationChangedEventArgs">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:log4net.Repository.ConfigurationChangedEventArgs.#ctor(System.Collections.ICollection)">
+            <summary>
+            
+            </summary>
+            <param name="configurationMessages"></param>
+        </member>
+        <member name="P:log4net.Repository.ConfigurationChangedEventArgs.ConfigurationMessages">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:log4net.Repository.LoggerRepositoryShutdownEventHandler">
+            <summary>
+            Delegate used to handle logger repository shutdown event notifications
+            </summary>
+            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that is shutting down.</param>
+            <param name="e">Empty event args</param>
+            <remarks>
+            <para>
+            Delegate used to handle logger repository shutdown event notifications.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.LoggerRepositoryConfigurationResetEventHandler">
+            <summary>
+            Delegate used to handle logger repository configuration reset event notifications
+            </summary>
+            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that has had its configuration reset.</param>
+            <param name="e">Empty event args</param>
+            <remarks>
+            <para>
+            Delegate used to handle logger repository configuration reset event notifications.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Repository.LoggerRepositoryConfigurationChangedEventHandler">
+            <summary>
+            Delegate used to handle event notifications for logger repository configuration changes.
+            </summary>
+            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that has had its configuration changed.</param>
+            <param name="e">Empty event arguments.</param>
+            <remarks>
+            <para>
+            Delegate used to handle event notifications for logger repository configuration changes.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.AppDomainPatternConverter">
+            <summary>
+            Write the name of the current AppDomain to the output
+            </summary>
+            <remarks>
+            <para>
+            Write the name of the current AppDomain to the output writer
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.AppDomainPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the name of the current AppDomain to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes name of the current AppDomain to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.AppSettingPatternConverter">
+            <summary>
+            AppSetting pattern converter
+            </summary>
+            <remarks>
+            <para>
+            This pattern converter reads appSettings from the application configuration file.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is specified then that will be used to
+            lookup a single appSettings value. If no <see cref="P:log4net.Util.PatternConverter.Option"/> is specified
+            then all appSettings will be dumped as a list of key value pairs.
+            </para>
+            <para>
+            A typical use is to specify a base directory for log files, e.g.
+            <example>
+            <![CDATA[
+            <log4net>
+               <appender name="MyAppender" type="log4net.Appender.RollingFileAppender">
+                 <file type="log4net.Util.PatternString" value="appsetting{LogDirectory}MyApp.log"/>
+                  ...
+              </appender>
+            </log4net>
+            ]]>
+            </example>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.AppSettingPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the property value to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
+            then all the properties are written as key value pairs.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.DatePatternConverter">
+            <summary>
+            Write the current date to the output
+            </summary>
+            <remarks>
+            <para>
+            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
+            the current date and time to the writer as a string.
+            </para>
+            <para>
+            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
+            the formatting of the date. The following values are allowed:
+            <list type="definition">
+            	<listheader>
+            		<term>Option value</term>
+            		<description>Output</description>
+            	</listheader>
+            	<item>
+            		<term>ISO8601</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> formatter. 
+            		Formats using the <c>"yyyy-MM-dd HH:mm:ss,fff"</c> pattern.
+            		</description>
+            	</item>
+            	<item>
+            		<term>DATE</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> formatter. 
+            		Formats using the <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, <c>"06 Nov 1994 15:49:37,459"</c>.
+            		</description>
+            	</item>
+            	<item>
+            		<term>ABSOLUTE</term>
+            		<description>
+            		Uses the <see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/> formatter. 
+            		Formats using the <c>"HH:mm:ss,fff"</c> for example, <c>"15:49:37,459"</c>.
+            		</description>
+            	</item>
+            	<item>
+            		<term>other</term>
+            		<description>
+            		Any other pattern string uses the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> formatter. 
+            		This formatter passes the pattern string to the <see cref="T:System.DateTime"/> 
+            		<see cref="M:DateTime.ToString(string)"/> method.
+            		For details on valid patterns see 
+            		<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemglobalizationdatetimeformatinfoclasstopic.asp">DateTimeFormatInfo Class</a>.
+            		</description>
+            	</item>
+            </list>
+            </para>
+            <para>
+            The date and time is in the local time zone and is rendered in that zone.
+            To output the time in Universal time see <see cref="T:log4net.Util.PatternStringConverters.UtcDatePatternConverter"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.DatePatternConverter.m_dateFormatter">
+            <summary>
+            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.DatePatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the current date to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Pass the current date and time to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
+            for it to render it to the writer.
+            </para>
+            <para>
+            The date and time passed is in the local time zone.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.DatePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the DatePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.EnvironmentFolderPathPatternConverter">
+            <summary>
+            Write an <see cref="T:System.Environment.SpecialFolder"/> folder path to the output
+            </summary>
+            <remarks>
+            <para>
+            Write an special path environment folder path to the output writer.
+            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
+            the name of the variable to output. <see cref="P:log4net.Util.PatternConverter.Option"/>
+            should be a value in the <see cref="T:System.Environment.SpecialFolder"/> enumeration.
+            </para>
+            </remarks>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.EnvironmentFolderPathPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write an special path environment folder path to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes the special path environment folder path to the output <paramref name="writer"/>.
+            The name of the special path environment folder path to output must be set
+            using the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.EnvironmentFolderPathPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the EnvironmentFolderPathPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.EnvironmentPatternConverter">
+            <summary>
+            Write an environment variable to the output
+            </summary>
+            <remarks>
+            <para>
+            Write an environment variable to the output writer.
+            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
+            the name of the variable to output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.EnvironmentPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write an environment variable to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes the environment variable to the output <paramref name="writer"/>.
+            The name of the environment variable to output must be set
+            using the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.EnvironmentPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the EnvironmentPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.IdentityPatternConverter">
+            <summary>
+            Write the current thread identity to the output
+            </summary>
+            <remarks>
+            <para>
+            Write the current thread identity to the output writer
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.IdentityPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the current thread identity to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes the current thread identity to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.IdentityPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the IdentityPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.LiteralPatternConverter">
+            <summary>
+            Pattern converter for literal string instances in the pattern
+            </summary>
+            <remarks>
+            <para>
+            Writes the literal string value specified in the 
+            <see cref="P:log4net.Util.PatternConverter.Option"/> property to 
+            the output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.SetNext(log4net.Util.PatternConverter)">
+            <summary>
+            Set the next converter in the chain
+            </summary>
+            <param name="pc">The next pattern converter in the chain</param>
+            <returns>The next pattern converter</returns>
+            <remarks>
+            <para>
+            Special case the building of the pattern converter chain
+            for <see cref="T:log4net.Util.PatternStringConverters.LiteralPatternConverter"/> instances. Two adjacent
+            literals in the pattern can be represented by a single combined
+            pattern converter. This implementation detects when a 
+            <see cref="T:log4net.Util.PatternStringConverters.LiteralPatternConverter"/> is added to the chain
+            after this converter and combines its value with this converter's
+            literal value.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.Format(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the literal to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, not set</param>
+            <remarks>
+            <para>
+            Override the formatting behavior to ignore the FormattingInfo
+            because we have a literal instead.
+            </para>
+            <para>
+            Writes the value of <see cref="P:log4net.Util.PatternConverter.Option"/>
+            to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Convert this pattern into the rendered message
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">null, not set</param>
+            <remarks>
+            <para>
+            This method is not used.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.NewLinePatternConverter">
+            <summary>
+            Writes a newline to the output
+            </summary>
+            <remarks>
+            <para>
+            Writes the system dependent line terminator to the output.
+            This behavior can be overridden by setting the <see cref="P:log4net.Util.PatternConverter.Option"/>:
+            </para>
+            <list type="definition">
+              <listheader>
+                <term>Option Value</term>
+                <description>Output</description>
+              </listheader>
+              <item>
+                <term>DOS</term>
+                <description>DOS or Windows line terminator <c>"\r\n"</c></description>
+              </item>
+              <item>
+                <term>UNIX</term>
+                <description>UNIX line terminator <c>"\n"</c></description>
+              </item>
+            </list>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.ProcessIdPatternConverter">
+            <summary>
+            Write the current process ID to the output
+            </summary>
+            <remarks>
+            <para>
+            Write the current process ID to the output writer
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.ProcessIdPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the current process ID to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Write the current process ID to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.ProcessIdPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the ProcessIdPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.PropertyPatternConverter">
+            <summary>
+            Property pattern converter
+            </summary>
+            <remarks>
+            <para>
+            This pattern converter reads the thread and global properties.
+            The thread properties take priority over global properties.
+            See <see cref="P:log4net.ThreadContext.Properties"/> for details of the 
+            thread properties. See <see cref="P:log4net.GlobalContext.Properties"/> for
+            details of the global properties.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is specified then that will be used to
+            lookup a single property. If no <see cref="P:log4net.Util.PatternConverter.Option"/> is specified
+            then all properties will be dumped as a list of key value pairs.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.PropertyPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the property value to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Writes out the value of a named property. The property name
+            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            property.
+            </para>
+            <para>
+            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
+            then all the properties are written as key value pairs.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.RandomStringPatternConverter">
+            <summary>
+            A Pattern converter that generates a string of random characters
+            </summary>
+            <remarks>
+            <para>
+            The converter generates a string of random characters. By default
+            the string is length 4. This can be changed by setting the <see cref="P:log4net.Util.PatternConverter.Option"/>
+            to the string value of the length required.
+            </para>
+            <para>
+            The random characters in the string are limited to uppercase letters
+            and numbers only.
+            </para>
+            <para>
+            The random number generator used by this class is not cryptographically secure.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.RandomStringPatternConverter.s_random">
+            <summary>
+            Shared random number generator
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.RandomStringPatternConverter.m_length">
+            <summary>
+            Length of random string to generate. Default length 4.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions">
+            <summary>
+            Initialize the converter options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write a randoim string to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Write a randoim string to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.RandomStringPatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the RandomStringPatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.UserNamePatternConverter">
+            <summary>
+            Write the current threads username to the output
+            </summary>
+            <remarks>
+            <para>
+            Write the current threads username to the output writer
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.UserNamePatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the current threads username to the output
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Write the current threads username to the output <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.UserNamePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the UserNamePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternStringConverters.UtcDatePatternConverter">
+            <summary>
+            Write the UTC date time to the output
+            </summary>
+            <remarks>
+            <para>
+            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
+            the current date and time in Universal time.
+            </para>
+            <para>
+            See the <see cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/> for details on the date pattern syntax.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.PatternStringConverters.UtcDatePatternConverter.Convert(System.IO.TextWriter,System.Object)">
+            <summary>
+            Write the current date and time to the output
+            </summary>
+            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
+            <param name="state">null, state is not set</param>
+            <remarks>
+            <para>
+            Pass the current date and time to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
+            for it to render it to the writer.
+            </para>
+            <para>
+            The date is in Universal time when it is rendered.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/>
+        </member>
+        <member name="F:log4net.Util.PatternStringConverters.UtcDatePatternConverter.declaringType">
+            <summary>
+            The fully qualified type of the UtcDatePatternConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.BooleanConverter">
+            <summary>
+            Type converter for Boolean.
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <c>bool</c> type.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.BooleanConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.BooleanConverter.ConvertFrom(System.Object)">
+            <summary>
+            Convert the source object to the type supported by this object
+            </summary>
+            <param name="source">the object to convert</param>
+            <returns>the converted object</returns>
+            <remarks>
+            <para>
+            Uses the <see cref="M:System.Boolean.Parse(System.String)"/> method to convert the
+            <see cref="T:System.String"/> argument to a <see cref="T:System.Boolean"/>.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.BooleanConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            <summary>
+            Exception base type for conversion errors.
+            </summary>
+            <remarks>
+            <para>
+            This type extends <see cref="T:System.ApplicationException"/>. It
+            does not add any new functionality but does differentiate the
+            type of exception being thrown.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">A message to include with the exception.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class
+            with the specified message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.String,System.Exception)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">A message to include with the exception.</param>
+            <param name="innerException">A nested exception to include.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class
+            with the specified message and inner exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization constructor
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class 
+            with serialized data.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.Create(System.Type,System.Object)">
+            <summary>
+            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
+            </summary>
+            <param name="destinationType">The conversion destination type.</param>
+            <param name="sourceValue">The value to convert.</param>
+            <returns>An instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/>.</returns>
+            <remarks>
+            <para>
+            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.Create(System.Type,System.Object,System.Exception)">
+            <summary>
+            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
+            </summary>
+            <param name="destinationType">The conversion destination type.</param>
+            <param name="sourceValue">The value to convert.</param>
+            <param name="innerException">A nested exception to include.</param>
+            <returns>An instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/>.</returns>
+            <remarks>
+            <para>
+            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.ConverterRegistry">
+            <summary>
+            Register of type converters for specific types.
+            </summary>
+            <remarks>
+            <para>
+            Maintains a registry of type converters used to convert between
+            types.
+            </para>
+            <para>
+            Use the <see cref="M:AddConverter(Type, object)"/> and 
+            <see cref="M:AddConverter(Type, Type)"/> methods to register new converters.
+            The <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertTo(System.Type,System.Type)"/> and <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertFrom(System.Type)"/> methods
+            lookup appropriate converters to use.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.#ctor">
+            <summary>
+            Private constructor
+            </summary>
+            <remarks>
+            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConverterRegistry"/> class.
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.#cctor">
+            <summary>
+            Static constructor.
+            </summary>
+            <remarks>
+            <para>
+            This constructor defines the intrinsic type converters.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Object)">
+            <summary>
+            Adds a converter for a specific type.
+            </summary>
+            <param name="destinationType">The type being converted to.</param>
+            <param name="converter">The type converter to use to convert to the destination type.</param>
+            <remarks>
+            <para>
+            Adds a converter instance for a specific type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Type)">
+            <summary>
+            Adds a converter for a specific type.
+            </summary>
+            <param name="destinationType">The type being converted to.</param>
+            <param name="converterType">The type of the type converter to use to convert to the destination type.</param>
+            <remarks>
+            <para>
+            Adds a converter <see cref="T:System.Type"/> for a specific type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertTo(System.Type,System.Type)">
+            <summary>
+            Gets the type converter to use to convert values to the destination type.
+            </summary>
+            <param name="sourceType">The type being converted from.</param>
+            <param name="destinationType">The type being converted to.</param>
+            <returns>
+            The type converter instance to use for type conversions or <c>null</c> 
+            if no type converter is found.
+            </returns>
+            <remarks>
+            <para>
+            Gets the type converter to use to convert values to the destination type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertFrom(System.Type)">
+            <summary>
+            Gets the type converter to use to convert values to the destination type.
+            </summary>
+            <param name="destinationType">The type being converted to.</param>
+            <returns>
+            The type converter instance to use for type conversions or <c>null</c> 
+            if no type converter is found.
+            </returns>
+            <remarks>
+            <para>
+            Gets the type converter to use to convert values to the destination type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConverterFromAttribute(System.Type)">
+            <summary>
+            Lookups the type converter to use as specified by the attributes on the 
+            destination type.
+            </summary>
+            <param name="destinationType">The type being converted to.</param>
+            <returns>
+            The type converter instance to use for type conversions or <c>null</c> 
+            if no type converter is found.
+            </returns>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.CreateConverterInstance(System.Type)">
+            <summary>
+            Creates the instance of the type converter.
+            </summary>
+            <param name="converterType">The type of the type converter.</param>
+            <returns>
+            The type converter instance to use for type conversions or <c>null</c> 
+            if no type converter is found.
+            </returns>
+            <remarks>
+            <para>
+            The type specified for the type converter must implement 
+            the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> or <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces 
+            and must have a public default (no argument) constructor.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.TypeConverters.ConverterRegistry.declaringType">
+            <summary>
+            The fully qualified type of the ConverterRegistry class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.TypeConverters.ConverterRegistry.s_type2converter">
+            <summary>
+            Mapping from <see cref="T:System.Type"/> to type converter.
+            </summary>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.EncodingConverter">
+            <summary>
+            Supports conversion from string to <see cref="T:System.Text.Encoding"/> type.
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <see cref="T:System.Text.Encoding"/> type.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.EncodingConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.EncodingConverter.ConvertFrom(System.Object)">
+            <summary>
+            Overrides the ConvertFrom method of IConvertFrom.
+            </summary>
+            <param name="source">the object to convert to an encoding</param>
+            <returns>the encoding</returns>
+            <remarks>
+            <para>
+            Uses the <see cref="M:Encoding.GetEncoding(string)"/> method to 
+            convert the <see cref="T:System.String"/> argument to an <see cref="T:System.Text.Encoding"/>.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.EncodingConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.IConvertTo">
+            <summary>
+            Interface supported by type converters
+            </summary>
+            <remarks>
+            <para>
+            This interface supports conversion from a single type to arbitrary types.
+            See <see cref="T:log4net.Util.TypeConverters.TypeConverterAttribute"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IConvertTo.CanConvertTo(System.Type)">
+            <summary>
+            Returns whether this converter can convert the object to the specified type
+            </summary>
+            <param name="targetType">A Type that represents the type you want to convert to</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Test if the type supported by this converter can be converted to the
+            <paramref name="targetType"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IConvertTo.ConvertTo(System.Object,System.Type)">
+            <summary>
+            Converts the given value object to the specified type, using the arguments
+            </summary>
+            <param name="source">the object to convert</param>
+            <param name="targetType">The Type to convert the value parameter to</param>
+            <returns>the converted object</returns>
+            <remarks>
+            <para>
+            Converts the <paramref name="source"/> (which must be of the type supported
+            by this converter) to the <paramref name="targetType"/> specified..
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.IPAddressConverter">
+            <summary>
+            Supports conversion from string to <see cref="T:System.Net.IPAddress"/> type.
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <see cref="T:System.Net.IPAddress"/> type.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IPAddressConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.IPAddressConverter.ConvertFrom(System.Object)">
+            <summary>
+            Overrides the ConvertFrom method of IConvertFrom.
+            </summary>
+            <param name="source">the object to convert to an IPAddress</param>
+            <returns>the IPAddress</returns>
+            <remarks>
+            <para>
+            Uses the <see cref="M:System.Net.IPAddress.Parse(System.String)"/> method to convert the
+            <see cref="T:System.String"/> argument to an <see cref="T:System.Net.IPAddress"/>.
+            If that fails then the string is resolved as a DNS hostname.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.IPAddressConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="F:log4net.Util.TypeConverters.IPAddressConverter.validIpAddressChars">
+            <summary>
+            Valid characters in an IPv4 or IPv6 address string. (Does not support subnets)
+            </summary>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.PatternLayoutConverter">
+            <summary>
+            Supports conversion from string to <see cref="T:log4net.Layout.PatternLayout"/> type.
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <see cref="T:log4net.Layout.PatternLayout"/> type.
+            </para>
+            <para>
+            The string is used as the <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/> 
+            of the <see cref="T:log4net.Layout.PatternLayout"/>.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternLayoutConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternLayoutConverter.ConvertFrom(System.Object)">
+            <summary>
+            Overrides the ConvertFrom method of IConvertFrom.
+            </summary>
+            <param name="source">the object to convert to a PatternLayout</param>
+            <returns>the PatternLayout</returns>
+            <remarks>
+            <para>
+            Creates and returns a new <see cref="T:log4net.Layout.PatternLayout"/> using
+            the <paramref name="source"/> <see cref="T:System.String"/> as the
+            <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/>.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.PatternLayoutConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.PatternStringConverter">
+            <summary>
+            Convert between string and <see cref="T:log4net.Util.PatternString"/>
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <see cref="T:log4net.Util.PatternString"/> type, 
+            and from a <see cref="T:log4net.Util.PatternString"/> type to a string.
+            </para>
+            <para>
+            The string is used as the <see cref="P:log4net.Util.PatternString.ConversionPattern"/> 
+            of the <see cref="T:log4net.Util.PatternString"/>.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertTo(System.Type)">
+            <summary>
+            Can the target type be converted to the type supported by this object
+            </summary>
+            <param name="targetType">A <see cref="T:System.Type"/> that represents the type you want to convert to</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="targetType"/> is
+            assignable from a <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.ConvertTo(System.Object,System.Type)">
+            <summary>
+            Converts the given value object to the specified type, using the arguments
+            </summary>
+            <param name="source">the object to convert</param>
+            <param name="targetType">The Type to convert the value parameter to</param>
+            <returns>the converted object</returns>
+            <remarks>
+            <para>
+            Uses the <see cref="M:PatternString.Format()"/> method to convert the
+            <see cref="T:log4net.Util.PatternString"/> argument to a <see cref="T:System.String"/>.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            <paramref name="targetType"/>. To check for this condition use the 
+            <see cref="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertTo(System.Type)"/> method.
+            </exception>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.ConvertFrom(System.Object)">
+            <summary>
+            Overrides the ConvertFrom method of IConvertFrom.
+            </summary>
+            <param name="source">the object to convert to a PatternString</param>
+            <returns>the PatternString</returns>
+            <remarks>
+            <para>
+            Creates and returns a new <see cref="T:log4net.Util.PatternString"/> using
+            the <paramref name="source"/> <see cref="T:System.String"/> as the
+            <see cref="P:log4net.Util.PatternString.ConversionPattern"/>.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.TypeConverter">
+            <summary>
+            Supports conversion from string to <see cref="T:System.Type"/> type.
+            </summary>
+            <remarks>
+            <para>
+            Supports conversion from string to <see cref="T:System.Type"/> type.
+            </para>
+            </remarks>
+            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
+            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.TypeConverter.CanConvertFrom(System.Type)">
+            <summary>
+            Can the source type be converted to the type supported by this object
+            </summary>
+            <param name="sourceType">the type to convert</param>
+            <returns>true if the conversion is possible</returns>
+            <remarks>
+            <para>
+            Returns <c>true</c> if the <paramref name="sourceType"/> is
+            the <see cref="T:System.String"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.TypeConverter.ConvertFrom(System.Object)">
+            <summary>
+            Overrides the ConvertFrom method of IConvertFrom.
+            </summary>
+            <param name="source">the object to convert to a Type</param>
+            <returns>the Type</returns>
+            <remarks>
+            <para>
+            Uses the <see cref="M:Type.GetType(string,bool)"/> method to convert the
+            <see cref="T:System.String"/> argument to a <see cref="T:System.Type"/>.
+            Additional effort is made to locate partially specified types
+            by searching the loaded assemblies.
+            </para>
+            </remarks>
+            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
+            The <paramref name="source"/> object cannot be converted to the
+            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.TypeConverter.CanConvertFrom(System.Type)"/>
+            method.
+            </exception>
+        </member>
+        <member name="T:log4net.Util.TypeConverters.TypeConverterAttribute">
+            <summary>
+            Attribute used to associate a type converter
+            </summary>
+            <remarks>
+            <para>
+            Class and Interface level attribute that specifies a type converter
+            to use with the associated type.
+            </para>
+            <para>
+            To associate a type converter with a target type apply a
+            <c>TypeConverterAttribute</c> to the target type. Specify the
+            type of the type converter on the attribute.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Util.TypeConverters.TypeConverterAttribute.m_typeName">
+            <summary>
+            The string type name of the type converter
+            </summary>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor(System.String)">
+            <summary>
+            Create a new type converter attribute for the specified type name
+            </summary>
+            <param name="typeName">The string type name of the type converter</param>
+            <remarks>
+            <para>
+            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
+            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor(System.Type)">
+            <summary>
+            Create a new type converter attribute for the specified type
+            </summary>
+            <param name="converterType">The type of the type converter</param>
+            <remarks>
+            <para>
+            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
+            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.TypeConverters.TypeConverterAttribute.ConverterTypeName">
+            <summary>
+            The string type name of the type converter 
+            </summary>
+            <value>
+            The string type name of the type converter 
+            </value>
+            <remarks>
+            <para>
+            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
+            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.AppenderAttachedImpl">
+            <summary>
+            A straightforward implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface.
+            </summary>
+            <remarks>
+            <para>
+            This is the default implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/>
+            interface. Implementors of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
+            should aggregate an instance of this type.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.AppenderAttachedImpl"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.AppendLoopOnAppenders(log4net.Core.LoggingEvent)">
+            <summary>
+            Append on on all attached appenders.
+            </summary>
+            <param name="loggingEvent">The event being logged.</param>
+            <returns>The number of appenders called.</returns>
+            <remarks>
+            <para>
+            Calls the <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method on all 
+            attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.AppendLoopOnAppenders(log4net.Core.LoggingEvent[])">
+            <summary>
+            Append on on all attached appenders.
+            </summary>
+            <param name="loggingEvents">The array of events being logged.</param>
+            <returns>The number of appenders called.</returns>
+            <remarks>
+            <para>
+            Calls the <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method on all 
+            attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.CallAppend(log4net.Appender.IAppender,log4net.Core.LoggingEvent[])">
+            <summary>
+            Calls the DoAppende method on the <see cref="T:log4net.Appender.IAppender"/> with 
+            the <see cref="T:log4net.Core.LoggingEvent"/> objects supplied.
+            </summary>
+            <param name="appender">The appender</param>
+            <param name="loggingEvents">The events</param>
+            <remarks>
+            <para>
+            If the <paramref name="appender"/> supports the <see cref="T:log4net.Appender.IBulkAppender"/>
+            interface then the <paramref name="loggingEvents"/> will be passed 
+            through using that interface. Otherwise the <see cref="T:log4net.Core.LoggingEvent"/>
+            objects in the array will be passed one at a time.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.AddAppender(log4net.Appender.IAppender)">
+            <summary>
+            Attaches an appender.
+            </summary>
+            <param name="newAppender">The appender to add.</param>
+            <remarks>
+            <para>
+            If the appender is already in the list it won't be added again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.GetAppender(System.String)">
+            <summary>
+            Gets an attached appender with the specified name.
+            </summary>
+            <param name="name">The name of the appender to get.</param>
+            <returns>
+            The appender with the name specified, or <c>null</c> if no appender with the
+            specified name is found.
+            </returns>
+            <remarks>
+            <para>
+            Lookup an attached appender by name.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAllAppenders">
+            <summary>
+            Removes all attached appenders.
+            </summary>
+            <remarks>
+            <para>
+            Removes and closes all attached appenders
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAppender(log4net.Appender.IAppender)">
+            <summary>
+            Removes the specified appender from the list of attached appenders.
+            </summary>
+            <param name="appender">The appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAppender(System.String)">
+            <summary>
+            Removes the appender with the specified name from the list of appenders.
+            </summary>
+            <param name="name">The name of the appender to remove.</param>
+            <returns>The appender removed from the list</returns>
+            <remarks>
+            <para>
+            The appender removed is not closed.
+            If you are discarding the appender you must call
+            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.AppenderAttachedImpl.m_appenderList">
+            <summary>
+            List of appenders
+            </summary>
+        </member>
+        <member name="F:log4net.Util.AppenderAttachedImpl.m_appenderArray">
+            <summary>
+            Array of appenders, used to cache the m_appenderList
+            </summary>
+        </member>
+        <member name="F:log4net.Util.AppenderAttachedImpl.declaringType">
+            <summary>
+            The fully qualified type of the AppenderAttachedImpl class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.AppenderAttachedImpl.Appenders">
+            <summary>
+            Gets all attached appenders.
+            </summary>
+            <returns>
+            A collection of attached appenders, or <c>null</c> if there
+            are no attached appenders.
+            </returns>
+            <remarks>
+            <para>
+            The read only collection of all currently attached appenders.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.CompositeProperties">
+            <summary>
+            This class aggregates several PropertiesDictionary collections together.
+            </summary>
+            <remarks>
+            <para>
+            Provides a dictionary style lookup over an ordered list of
+            <see cref="T:log4net.Util.PropertiesDictionary"/> collections.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.CompositeProperties.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.CompositeProperties"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CompositeProperties.Add(log4net.Util.ReadOnlyPropertiesDictionary)">
+            <summary>
+            Add a Properties Dictionary to this composite collection
+            </summary>
+            <param name="properties">the properties to add</param>
+            <remarks>
+            <para>
+            Properties dictionaries added first take precedence over dictionaries added
+            later.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CompositeProperties.Flatten">
+            <summary>
+            Flatten this composite collection into a single properties dictionary
+            </summary>
+            <returns>the flattened dictionary</returns>
+            <remarks>
+            <para>
+            Reduces the collection of ordered dictionaries to a single dictionary
+            containing the resultant values for the keys.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.CompositeProperties.Item(System.String)">
+            <summary>
+            Gets the value of a property
+            </summary>
+            <value>
+            The value for the property with the specified key
+            </value>
+            <remarks>
+            <para>
+            Looks up the value for the <paramref name="key"/> specified.
+            The <see cref="T:log4net.Util.PropertiesDictionary"/> collections are searched
+            in the order in which they were added to this collection. The value
+            returned is the value held by the first collection that contains
+            the specified key.
+            </para>
+            <para>
+            If none of the collections contain the specified key then
+            <c>null</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ContextPropertiesBase">
+            <summary>
+            Base class for Context Properties implementations
+            </summary>
+            <remarks>
+            <para>
+            This class defines a basic property get set accessor
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="P:log4net.Util.ContextPropertiesBase.Item(System.String)">
+            <summary>
+            Gets or sets the value of a property
+            </summary>
+            <value>
+            The value for the property with the specified key
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the value of a property
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ConverterInfo">
+            <summary>
+            Wrapper class used to map converter names to converter types
+            </summary>
+            <remarks>
+            <para>
+            Pattern converter info class used during configuration by custom
+            PatternString and PatternLayer converters.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ConverterInfo.#ctor">
+            <summary>
+            default constructor
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ConverterInfo.AddProperty(log4net.Util.PropertyEntry)">
+            <summary>
+            
+            </summary>
+            <param name="entry"></param>
+        </member>
+        <member name="P:log4net.Util.ConverterInfo.Name">
+            <summary>
+            Gets or sets the name of the conversion pattern
+            </summary>
+            <remarks>
+            <para>
+            The name of the pattern in the format string
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ConverterInfo.Type">
+            <summary>
+            Gets or sets the type of the converter
+            </summary>
+            <remarks>
+            <para>
+            The value specified must extend the 
+            <see cref="T:log4net.Util.PatternConverter"/> type.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ConverterInfo.Properties">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:log4net.Util.CountingQuietTextWriter">
+            <summary>
+            Subclass of <see cref="T:log4net.Util.QuietTextWriter"/> that maintains a count of 
+            the number of bytes written.
+            </summary>
+            <remarks>
+            <para>
+            This writer counts the number of bytes written.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Util.QuietTextWriter">
+            <summary>
+            <see cref="T:System.IO.TextWriter"/> that does not leak exceptions
+            </summary>
+            <remarks>
+            <para>
+            <see cref="T:log4net.Util.QuietTextWriter"/> does not throw exceptions when things go wrong. 
+            Instead, it delegates error handling to its <see cref="T:log4net.Core.IErrorHandler"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Util.TextWriterAdapter">
+            <summary>
+            Adapter that extends <see cref="T:System.IO.TextWriter"/> and forwards all
+            messages to an instance of <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <remarks>
+            <para>
+            Adapter that extends <see cref="T:System.IO.TextWriter"/> and forwards all
+            messages to an instance of <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.TextWriterAdapter.m_writer">
+            <summary>
+            The writer to forward messages to
+            </summary>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.#ctor(System.IO.TextWriter)">
+            <summary>
+            Create an instance of <see cref="T:log4net.Util.TextWriterAdapter"/> that forwards all
+            messages to a <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to forward to</param>
+            <remarks>
+            <para>
+            Create an instance of <see cref="T:log4net.Util.TextWriterAdapter"/> that forwards all
+            messages to a <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Close">
+            <summary>
+            Closes the writer and releases any system resources associated with the writer
+            </summary>
+            <remarks>
+            <para>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Dispose(System.Boolean)">
+            <summary>
+            Dispose this writer
+            </summary>
+            <param name="disposing">flag indicating if we are being disposed</param>
+            <remarks>
+            <para>
+            Dispose this writer
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Flush">
+            <summary>
+            Flushes any buffered output
+            </summary>
+            <remarks>
+            <para>
+            Clears all buffers for the writer and causes any buffered data to be written 
+            to the underlying device
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Write(System.Char)">
+            <summary>
+            Writes a character to the wrapped TextWriter
+            </summary>
+            <param name="value">the value to write to the TextWriter</param>
+            <remarks>
+            <para>
+            Writes a character to the wrapped TextWriter
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Write(System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Writes a character buffer to the wrapped TextWriter
+            </summary>
+            <param name="buffer">the data buffer</param>
+            <param name="index">the start index</param>
+            <param name="count">the number of characters to write</param>
+            <remarks>
+            <para>
+            Writes a character buffer to the wrapped TextWriter
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.TextWriterAdapter.Write(System.String)">
+            <summary>
+            Writes a string to the wrapped TextWriter
+            </summary>
+            <param name="value">the value to write to the TextWriter</param>
+            <remarks>
+            <para>
+            Writes a string to the wrapped TextWriter
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.TextWriterAdapter.Writer">
+            <summary>
+            Gets or sets the underlying <see cref="T:System.IO.TextWriter"/>.
+            </summary>
+            <value>
+            The underlying <see cref="T:System.IO.TextWriter"/>.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the underlying <see cref="T:System.IO.TextWriter"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.TextWriterAdapter.Encoding">
+            <summary>
+            The Encoding in which the output is written
+            </summary>
+            <value>
+            The <see cref="P:log4net.Util.TextWriterAdapter.Encoding"/>
+            </value>
+            <remarks>
+            <para>
+            The Encoding in which the output is written
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.TextWriterAdapter.FormatProvider">
+            <summary>
+            Gets an object that controls formatting
+            </summary>
+            <value>
+            The format provider
+            </value>
+            <remarks>
+            <para>
+            Gets an object that controls formatting
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.TextWriterAdapter.NewLine">
+            <summary>
+            Gets or sets the line terminator string used by the TextWriter
+            </summary>
+            <value>
+            The line terminator to use
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the line terminator string used by the TextWriter
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.QuietTextWriter.#ctor(System.IO.TextWriter,log4net.Core.IErrorHandler)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="writer">the writer to actually write to</param>
+            <param name="errorHandler">the error handler to report error to</param>
+            <remarks>
+            <para>
+            Create a new QuietTextWriter using a writer and error handler
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.QuietTextWriter.Write(System.Char)">
+            <summary>
+            Writes a character to the underlying writer
+            </summary>
+            <param name="value">the char to write</param>
+            <remarks>
+            <para>
+            Writes a character to the underlying writer
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.QuietTextWriter.Write(System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Writes a buffer to the underlying writer
+            </summary>
+            <param name="buffer">the buffer to write</param>
+            <param name="index">the start index to write from</param>
+            <param name="count">the number of characters to write</param>
+            <remarks>
+            <para>
+            Writes a buffer to the underlying writer
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.QuietTextWriter.Write(System.String)">
+            <summary>
+            Writes a string to the output.
+            </summary>
+            <param name="value">The string data to write to the output.</param>
+            <remarks>
+            <para>
+            Writes a string to the output.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.QuietTextWriter.Close">
+            <summary>
+            Closes the underlying output writer.
+            </summary>
+            <remarks>
+            <para>
+            Closes the underlying output writer.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.QuietTextWriter.m_errorHandler">
+            <summary>
+            The error handler instance to pass all errors to
+            </summary>
+        </member>
+        <member name="F:log4net.Util.QuietTextWriter.m_closed">
+            <summary>
+            Flag to indicate if this writer is closed
+            </summary>
+        </member>
+        <member name="P:log4net.Util.QuietTextWriter.ErrorHandler">
+            <summary>
+            Gets or sets the error handler that all errors are passed to.
+            </summary>
+            <value>
+            The error handler that all errors are passed to.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the error handler that all errors are passed to.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.QuietTextWriter.Closed">
+            <summary>
+            Gets a value indicating whether this writer is closed.
+            </summary>
+            <value>
+            <c>true</c> if this writer is closed, otherwise <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            Gets a value indicating whether this writer is closed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CountingQuietTextWriter.#ctor(System.IO.TextWriter,log4net.Core.IErrorHandler)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to actually write to.</param>
+            <param name="errorHandler">The <see cref="T:log4net.Core.IErrorHandler"/> to report errors to.</param>
+            <remarks>
+            <para>
+            Creates a new instance of the <see cref="T:log4net.Util.CountingQuietTextWriter"/> class 
+            with the specified <see cref="T:System.IO.TextWriter"/> and <see cref="T:log4net.Core.IErrorHandler"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.Char)">
+            <summary>
+            Writes a character to the underlying writer and counts the number of bytes written.
+            </summary>
+            <param name="value">the char to write</param>
+            <remarks>
+            <para>
+            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
+            the number of bytes written.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Writes a buffer to the underlying writer and counts the number of bytes written.
+            </summary>
+            <param name="buffer">the buffer to write</param>
+            <param name="index">the start index to write from</param>
+            <param name="count">the number of characters to write</param>
+            <remarks>
+            <para>
+            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
+            the number of bytes written.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.String)">
+            <summary>
+            Writes a string to the output and counts the number of bytes written.
+            </summary>
+            <param name="str">The string data to write to the output.</param>
+            <remarks>
+            <para>
+            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
+            the number of bytes written.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.CountingQuietTextWriter.m_countBytes">
+            <summary>
+            Total number of bytes written.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.CountingQuietTextWriter.Count">
+            <summary>
+            Gets or sets the total number of bytes written.
+            </summary>
+            <value>
+            The total number of bytes written.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the total number of bytes written.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.CyclicBuffer">
+            <summary>
+            A fixed size rolling buffer of logging events.
+            </summary>
+            <remarks>
+            <para>
+            An array backed fixed size leaky bucket.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.CyclicBuffer.#ctor(System.Int32)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="maxSize">The maximum number of logging events in the buffer.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.CyclicBuffer"/> class with 
+            the specified maximum number of buffered logging events.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="maxSize"/> argument is not a positive integer.</exception>
+        </member>
+        <member name="M:log4net.Util.CyclicBuffer.Append(log4net.Core.LoggingEvent)">
+            <summary>
+            Appends a <paramref name="loggingEvent"/> to the buffer.
+            </summary>
+            <param name="loggingEvent">The event to append to the buffer.</param>
+            <returns>The event discarded from the buffer, if the buffer is full, otherwise <c>null</c>.</returns>
+            <remarks>
+            <para>
+            Append an event to the buffer. If the buffer still contains free space then
+            <c>null</c> is returned. If the buffer is full then an event will be dropped
+            to make space for the new event, the event dropped is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CyclicBuffer.PopOldest">
+            <summary>
+            Get and remove the oldest event in the buffer.
+            </summary>
+            <returns>The oldest logging event in the buffer</returns>
+            <remarks>
+            <para>
+            Gets the oldest (first) logging event in the buffer and removes it 
+            from the buffer.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CyclicBuffer.PopAll">
+            <summary>
+            Pops all the logging events from the buffer into an array.
+            </summary>
+            <returns>An array of all the logging events in the buffer.</returns>
+            <remarks>
+            <para>
+            Get all the events in the buffer and clear the buffer.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.CyclicBuffer.Clear">
+            <summary>
+            Clear the buffer
+            </summary>
+            <remarks>
+            <para>
+            Clear the buffer of all events. The events in the buffer are lost.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.CyclicBuffer.Item(System.Int32)">
+            <summary>
+            Gets the <paramref name="i"/>th oldest event currently in the buffer.
+            </summary>
+            <value>The <paramref name="i"/>th oldest event currently in the buffer.</value>
+            <remarks>
+            <para>
+            If <paramref name="i"/> is outside the range 0 to the number of events
+            currently in the buffer, then <c>null</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.CyclicBuffer.MaxSize">
+            <summary>
+            Gets the maximum size of the buffer.
+            </summary>
+            <value>The maximum size of the buffer.</value>
+            <remarks>
+            <para>
+            Gets the maximum size of the buffer
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.CyclicBuffer.Length">
+            <summary>
+            Gets the number of logging events in the buffer.
+            </summary>
+            <value>The number of logging events in the buffer.</value>
+            <remarks>
+            <para>
+            This number is guaranteed to be in the range 0 to <see cref="P:log4net.Util.CyclicBuffer.MaxSize"/>
+            (inclusive).
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.EmptyCollection">
+            <summary>
+            An always empty <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <remarks>
+            <para>
+            A singleton implementation of the <see cref="T:System.Collections.ICollection"/>
+            interface that always represents an empty collection.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.EmptyCollection.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.EmptyCollection"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to enforce the singleton pattern.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyCollection.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an 
+            <see cref="T:System.Array"/>, starting at a particular Array index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> 
+            that is the destination of the elements copied from 
+            <see cref="T:System.Collections.ICollection"/>. The Array must have zero-based 
+            indexing.</param>
+            <param name="index">The zero-based index in array at which 
+            copying begins.</param>
+            <remarks>
+            <para>
+            As the collection is empty no values are copied into the array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyCollection.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
+            iterate through the collection.
+            </returns>
+            <remarks>
+            <para>
+            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.EmptyCollection.s_instance">
+            <summary>
+            The singleton instance of the empty collection.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.EmptyCollection.Instance">
+            <summary>
+            Gets the singleton instance of the empty collection.
+            </summary>
+            <returns>The singleton instance of the empty collection.</returns>
+            <remarks>
+            <para>
+            Gets the singleton instance of the empty collection.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyCollection.IsSynchronized">
+            <summary>
+            Gets a value indicating if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe).
+            </summary>
+            <value>
+            <b>true</b> if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe); otherwise, <b>false</b>.
+            </value>
+            <remarks>
+            <para>
+            For the <see cref="T:log4net.Util.EmptyCollection"/> this property is always <c>true</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyCollection.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <value>
+            The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
+            </value>
+            <remarks>
+            <para>
+            As the collection is empty the <see cref="P:log4net.Util.EmptyCollection.Count"/> is always <c>0</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyCollection.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <value>
+            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
+            </value>
+            <remarks>
+            <para>
+            As the collection is empty and thread safe and synchronized this instance is also
+            the <see cref="P:log4net.Util.EmptyCollection.SyncRoot"/> object.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.EmptyDictionary">
+            <summary>
+            An always empty <see cref="T:System.Collections.IDictionary"/>.
+            </summary>
+            <remarks>
+            <para>
+            A singleton implementation of the <see cref="T:System.Collections.IDictionary"/>
+            interface that always represents an empty collection.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.EmptyDictionary"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to enforce the singleton pattern.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an 
+            <see cref="T:System.Array"/>, starting at a particular Array index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> 
+            that is the destination of the elements copied from 
+            <see cref="T:System.Collections.ICollection"/>. The Array must have zero-based 
+            indexing.</param>
+            <param name="index">The zero-based index in array at which 
+            copying begins.</param>
+            <remarks>
+            <para>
+            As the collection is empty no values are copied into the array.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
+            iterate through the collection.
+            </returns>
+            <remarks>
+            <para>
+            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.Add(System.Object,System.Object)">
+            <summary>
+            Adds an element with the provided key and value to the 
+            <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <param name="key">The <see cref="T:System.Object"/> to use as the key of the element to add.</param>
+            <param name="value">The <see cref="T:System.Object"/> to use as the value of the element to add.</param>
+            <remarks>
+            <para>
+            As the collection is empty no new values can be added. A <see cref="T:System.InvalidOperationException"/>
+            is thrown if this method is called.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.Clear">
+            <summary>
+            Removes all elements from the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <remarks>
+            <para>
+            As the collection is empty no values can be removed. A <see cref="T:System.InvalidOperationException"/>
+            is thrown if this method is called.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.Contains(System.Object)">
+            <summary>
+            Determines whether the <see cref="T:log4net.Util.EmptyDictionary"/> contains an element 
+            with the specified key.
+            </summary>
+            <param name="key">The key to locate in the <see cref="T:log4net.Util.EmptyDictionary"/>.</param>
+            <returns><c>false</c></returns>
+            <remarks>
+            <para>
+            As the collection is empty the <see cref="M:log4net.Util.EmptyDictionary.Contains(System.Object)"/> method always returns <c>false</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.GetEnumerator">
+            <summary>
+            Returns an enumerator that can iterate through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
+            iterate through the collection.
+            </returns>
+            <remarks>
+            <para>
+            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.EmptyDictionary.Remove(System.Object)">
+            <summary>
+            Removes the element with the specified key from the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <param name="key">The key of the element to remove.</param>
+            <remarks>
+            <para>
+            As the collection is empty no values can be removed. A <see cref="T:System.InvalidOperationException"/>
+            is thrown if this method is called.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
+        </member>
+        <member name="F:log4net.Util.EmptyDictionary.s_instance">
+            <summary>
+            The singleton instance of the empty dictionary.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.Instance">
+            <summary>
+            Gets the singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <returns>The singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.</returns>
+            <remarks>
+            <para>
+            Gets the singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.IsSynchronized">
+            <summary>
+            Gets a value indicating if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe).
+            </summary>
+            <value>
+            <b>true</b> if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe); otherwise, <b>false</b>.
+            </value>
+            <remarks>
+            <para>
+            For the <see cref="T:log4net.Util.EmptyCollection"/> this property is always <b>true</b>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>
+            </summary>
+            <value>
+            The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
+            </value>
+            <remarks>
+            <para>
+            As the collection is empty the <see cref="P:log4net.Util.EmptyDictionary.Count"/> is always <c>0</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <value>
+            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
+            </value>
+            <remarks>
+            <para>
+            As the collection is empty and thread safe and synchronized this instance is also
+            the <see cref="P:log4net.Util.EmptyDictionary.SyncRoot"/> object.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.IsFixedSize">
+            <summary>
+            Gets a value indicating whether the <see cref="T:log4net.Util.EmptyDictionary"/> has a fixed size.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            As the collection is empty <see cref="P:log4net.Util.EmptyDictionary.IsFixedSize"/> always returns <c>true</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:log4net.Util.EmptyDictionary"/> is read-only.
+            </summary>
+            <value><c>true</c></value>
+            <remarks>
+            <para>
+            As the collection is empty <see cref="P:log4net.Util.EmptyDictionary.IsReadOnly"/> always returns <c>true</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.Keys">
+            <summary>
+            Gets an <see cref="T:System.Collections.ICollection"/> containing the keys of the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <value>An <see cref="T:System.Collections.ICollection"/> containing the keys of the <see cref="T:log4net.Util.EmptyDictionary"/>.</value>
+            <remarks>
+            <para>
+            As the collection is empty a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.Values">
+            <summary>
+            Gets an <see cref="T:System.Collections.ICollection"/> containing the values of the <see cref="T:log4net.Util.EmptyDictionary"/>.
+            </summary>
+            <value>An <see cref="T:System.Collections.ICollection"/> containing the values of the <see cref="T:log4net.Util.EmptyDictionary"/>.</value>
+            <remarks>
+            <para>
+            As the collection is empty a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.EmptyDictionary.Item(System.Object)">
+            <summary>
+            Gets or sets the element with the specified key.
+            </summary>
+            <param name="key">The key of the element to get or set.</param>
+            <value><c>null</c></value>
+            <remarks>
+            <para>
+            As the collection is empty no values can be looked up or stored. 
+            If the index getter is called then <c>null</c> is returned.
+            A <see cref="T:System.InvalidOperationException"/> is thrown if the setter is called.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
+        </member>
+        <member name="T:log4net.Util.FormattingInfo">
+            <summary>
+            Contain the information obtained when parsing formatting modifiers 
+            in conversion modifiers.
+            </summary>
+            <remarks>
+            <para>
+            Holds the formatting information extracted from the format string by
+            the <see cref="T:log4net.Util.PatternParser"/>. This is used by the <see cref="T:log4net.Util.PatternConverter"/>
+            objects when rendering the output.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.FormattingInfo.#ctor">
+            <summary>
+            Defaut Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.FormattingInfo"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.FormattingInfo.#ctor(System.Int32,System.Int32,System.Boolean)">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.FormattingInfo"/> class
+            with the specified parameters.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.FormattingInfo.Min">
+            <summary>
+            Gets or sets the minimum value.
+            </summary>
+            <value>
+            The minimum value.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the minimum value.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.FormattingInfo.Max">
+            <summary>
+            Gets or sets the maximum value.
+            </summary>
+            <value>
+            The maximum value.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the maximum value.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.FormattingInfo.LeftAlign">
+            <summary>
+            Gets or sets a flag indicating whether left align is enabled
+            or not.
+            </summary>
+            <value>
+            A flag indicating whether left align is enabled or not.
+            </value>
+            <remarks>
+            <para>
+            Gets or sets a flag indicating whether left align is enabled or not.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.GlobalContextProperties">
+            <summary>
+            Implementation of Properties collection for the <see cref="T:log4net.GlobalContext"/>
+            </summary>
+            <remarks>
+            <para>
+            This class implements a properties collection that is thread safe and supports both
+            storing properties and capturing a read only copy of the current propertied.
+            </para>
+            <para>
+            This class is optimized to the scenario where the properties are read frequently
+            and are modified infrequently.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.GlobalContextProperties.m_readOnlyProperties">
+            <summary>
+            The read only copy of the properties.
+            </summary>
+            <remarks>
+            <para>
+            This variable is declared <c>volatile</c> to prevent the compiler and JIT from
+            reordering reads and writes of this thread performed on different threads.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.GlobalContextProperties.m_syncRoot">
+            <summary>
+            Lock object used to synchronize updates within this instance
+            </summary>
+        </member>
+        <member name="M:log4net.Util.GlobalContextProperties.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.GlobalContextProperties"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.GlobalContextProperties.Remove(System.String)">
+            <summary>
+            Remove a property from the global context
+            </summary>
+            <param name="key">the key for the entry to remove</param>
+            <remarks>
+            <para>
+            Removing an entry from the global context properties is relatively expensive compared
+            with reading a value. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.GlobalContextProperties.Clear">
+            <summary>
+            Clear the global context properties
+            </summary>
+        </member>
+        <member name="M:log4net.Util.GlobalContextProperties.GetReadOnlyProperties">
+            <summary>
+            Get a readonly immutable copy of the properties
+            </summary>
+            <returns>the current global context properties</returns>
+            <remarks>
+            <para>
+            This implementation is fast because the GlobalContextProperties class
+            stores a readonly copy of the properties.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.GlobalContextProperties.Item(System.String)">
+            <summary>
+            Gets or sets the value of a property
+            </summary>
+            <value>
+            The value for the property with the specified key
+            </value>
+            <remarks>
+            <para>
+            Reading the value for a key is faster than setting the value.
+            When the value is written a new read only copy of 
+            the properties is created.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ILogExtensions">
+            <summary>
+            The static class ILogExtensions contains a set of widely used
+            methods that ease the interaction with the ILog interface implementations.
+            </summary>
+            <remarks>
+            <para>
+            This class contains methods for logging at different levels and checks the
+            properties for determining if those logging levels are enabled in the current
+            configuration.
+            </para>
+            </remarks>
+            <example>Simple example of logging messages
+            <code lang="C#">
+            using log4net.Util;
+            
+            ILog log = LogManager.GetLogger("application-log");
+            
+            log.InfoExt("Application Start");
+            log.DebugExt("This is a debug message");
+            </code>
+            </example>
+        </member>
+        <member name="F:log4net.Util.ILogExtensions.declaringType">
+            <summary>
+            The fully qualified type of the Logger class.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Func{System.Object})">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsDebugEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation.  If this logger is <c>INFO</c> enabled, then it converts 
+            the message object (retrieved by invocation of the provided callback) to a 
+            string by invoking the appropriate <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            It then proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Func{System.Object},System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Func{System.Object},System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.</overloads> //TODO
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsDebugEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation. If this logger is <c>INFO</c> enabled, then it converts 
+            the message object (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugFormatExt(log4net.ILog,System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugFormatExt(log4net.ILog,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugFormatExt(log4net.ILog,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugFormatExt(log4net.ILog,System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.DebugFormatExt(log4net.ILog,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.DebugExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Func{System.Object})">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsInfoEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation.  If this logger is <c>INFO</c> enabled, then it converts 
+            the message object (retrieved by invocation of the provided callback) to a 
+            string by invoking the appropriate <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            It then proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Func{System.Object},System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Func{System.Object},System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level.</overloads> //TODO
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>INFO</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsInfoEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation. If this logger is <c>INFO</c> enabled, then it converts 
+            the message object (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoFormatExt(log4net.ILog,System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoFormatExt(log4net.ILog,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoFormatExt(log4net.ILog,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoFormatExt(log4net.ILog,System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.InfoFormatExt(log4net.ILog,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.InfoExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Func{System.Object})">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>WARN</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsWarnEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation.  If this logger is <c>WARN</c> enabled, then it converts 
+            the message object (retrieved by invocation of the provided callback) to a 
+            string by invoking the appropriate <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            It then proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Func{System.Object},System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Func{System.Object},System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.</overloads> //TODO
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>WARN</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsWarnEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation. If this logger is <c>WARN</c> enabled, then it converts 
+            the message object (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnFormatExt(log4net.ILog,System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnFormatExt(log4net.ILog,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnFormatExt(log4net.ILog,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnFormatExt(log4net.ILog,System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.WarnFormatExt(log4net.ILog,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.WarnExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Func{System.Object})">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>ERROR</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsErrorEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation.  If this logger is <c>ERROR</c> enabled, then it converts 
+            the message object (retrieved by invocation of the provided callback) to a 
+            string by invoking the appropriate <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            It then proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Func{System.Object},System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Func{System.Object},System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level.</overloads> //TODO
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>ERROR</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsErrorEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation. If this logger is <c>ERROR</c> enabled, then it converts 
+            the message object (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorFormatExt(log4net.ILog,System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorFormatExt(log4net.ILog,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorFormatExt(log4net.ILog,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorFormatExt(log4net.ILog,System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.ErrorFormatExt(log4net.ILog,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.ErrorExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Func{System.Object})">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>FATAL</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsFatalEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation.  If this logger is <c>FATAL</c> enabled, then it converts 
+            the message object (retrieved by invocation of the provided callback) to a 
+            string by invoking the appropriate <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
+            It then proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Func{System.Object},System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Func{System.Object},System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="callback">The lambda expression that gets the object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object)">
+            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.</overloads> //TODO
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <remarks>
+            <para>
+            This method first checks if this logger is <c>FATAL</c>
+            enabled by reading the value <seealso cref="P:log4net.ILog.IsFatalEnabled"/> property.
+            This check happens always and does not depend on the <seealso cref="T:log4net.ILog"/>
+            implementation. If this logger is <c>FATAL</c> enabled, then it converts 
+            the message object (passed as parameter) to a string by invoking the appropriate
+            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
+            proceeds to call all the registered appenders in this logger 
+            and also higher in the hierarchy depending on the value of 
+            the additivity flag.
+            </para>
+            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
+            to this method will print the name of the <see cref="T:System.Exception"/> 
+            but no stack trace. To print a stack trace use the 
+            <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/> form instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)">
+            <summary>
+            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level including
+            the stack trace of the <see cref="T:System.Exception"/> passed
+            as a parameter.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="message">The message object to log.</param>
+            <param name="exception">The exception to log, including its stack trace.</param>
+            <remarks>
+            <para>
+            See the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object)"/> form for more detailed information.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalFormatExt(log4net.ILog,System.String,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalFormatExt(log4net.ILog,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalFormatExt(log4net.ILog,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="args">An Object array containing zero or more objects to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalFormatExt(log4net.ILog,System.String,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="M:log4net.Util.ILogExtensions.FatalFormatExt(log4net.ILog,System.String,System.Object,System.Object,System.Object)">
+            <summary>
+            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
+            </summary>
+            <param name="logger">The logger on which the message is logged.</param>
+            <param name="format">A String containing zero or more format items</param>
+            <param name="arg0">An Object to format</param>
+            <param name="arg1">An Object to format</param>
+            <param name="arg2">An Object to format</param>
+            <remarks>
+            <para>
+            The message is formatted using the <c>String.Format</c> method. See
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
+            of the formatting.
+            </para>
+            <para>
+            This method does not take an <see cref="T:System.Exception"/> object to include in the
+            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Util.ILogExtensions.FatalExt(log4net.ILog,System.Object,System.Exception)"/>
+            methods instead.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
+            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
+        </member>
+        <member name="T:log4net.Util.LevelMapping">
+            <summary>
+            Manages a mapping from levels to <see cref="T:log4net.Util.LevelMappingEntry"/>
+            </summary>
+            <remarks>
+            <para>
+            Manages an ordered mapping from <see cref="T:log4net.Core.Level"/> instances 
+            to <see cref="T:log4net.Util.LevelMappingEntry"/> subclasses.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.LevelMapping.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initialise a new instance of <see cref="T:log4net.Util.LevelMapping"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LevelMapping.Add(log4net.Util.LevelMappingEntry)">
+            <summary>
+            Add a <see cref="T:log4net.Util.LevelMappingEntry"/> to this mapping
+            </summary>
+            <param name="entry">the entry to add</param>
+            <remarks>
+            <para>
+            If a <see cref="T:log4net.Util.LevelMappingEntry"/> has previously been added
+            for the same <see cref="T:log4net.Core.Level"/> then that entry will be 
+            overwritten.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LevelMapping.Lookup(log4net.Core.Level)">
+            <summary>
+            Lookup the mapping for the specified level
+            </summary>
+            <param name="level">the level to lookup</param>
+            <returns>the <see cref="T:log4net.Util.LevelMappingEntry"/> for the level or <c>null</c> if no mapping found</returns>
+            <remarks>
+            <para>
+            Lookup the value for the specified level. Finds the nearest
+            mapping value for the level that is equal to or less than the
+            <paramref name="level"/> specified.
+            </para>
+            <para>
+            If no mapping could be found then <c>null</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LevelMapping.ActivateOptions">
+            <summary>
+            Initialize options
+            </summary>
+            <remarks>
+            <para>
+            Caches the sorted list of <see cref="T:log4net.Util.LevelMappingEntry"/> in an array
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogicalThreadContextProperties">
+            <summary>
+            Implementation of Properties collection for the <see cref="T:log4net.LogicalThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Class implements a collection of properties that is specific to each thread.
+            The class is not synchronized as each thread has its own <see cref="T:log4net.Util.PropertiesDictionary"/>.
+            </para>
+            <para>
+            This class stores its properties in a slot on the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> named
+            <c>log4net.Util.LogicalThreadContextProperties</c>.
+            </para>
+            <para>
+            For .NET Standard 1.3 this class uses
+            System.Threading.AsyncLocal rather than <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>.
+            </para>
+            <para>
+            The <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> requires a link time 
+            <see cref="T:System.Security.Permissions.SecurityPermission"/> for the
+            <see cref="F:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
+            If the calling code does not have this permission then this context will be disabled.
+            It will not store any property values set on it.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextProperties.m_disabled">
+            <summary>
+            Flag used to disable this context if we don't have permission to access the CallContext.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.LogicalThreadContextProperties"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.Remove(System.String)">
+            <summary>
+            Remove a property
+            </summary>
+            <param name="key">the key for the entry to remove</param>
+            <remarks>
+            <para>
+            Remove the value for the specified <paramref name="key"/> from the context.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.Clear">
+            <summary>
+            Clear all the context properties
+            </summary>
+            <remarks>
+            <para>
+            Clear all the context properties
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.GetProperties(System.Boolean)">
+            <summary>
+            Get the PropertiesDictionary stored in the LocalDataStoreSlot for this thread.
+            </summary>
+            <param name="create">create the dictionary if it does not exist, otherwise return null if is does not exist</param>
+            <returns>the properties for this thread</returns>
+            <remarks>
+            <para>
+            The collection returned is only to be used on the calling thread. If the
+            caller needs to share the collection between different threads then the 
+            caller must clone the collection before doings so.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.GetLogicalProperties">
+            <summary>
+            Gets the call context get data.
+            </summary>
+            <returns>The peroperties dictionary stored in the call context</returns>
+            <remarks>
+            The <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> method <see cref="M:System.Runtime.Remoting.Messaging.CallContext.GetData(System.String)"/> has a
+            security link demand, therfore we must put the method call in a seperate method
+            that we can wrap in an exception handler.
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextProperties.SetLogicalProperties(log4net.Util.PropertiesDictionary)">
+            <summary>
+            Sets the call context data.
+            </summary>
+            <param name="properties">The properties.</param>
+            <remarks>
+            The <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> method <see cref="M:System.Runtime.Remoting.Messaging.CallContext.SetData(System.String,System.Object)"/> has a
+            security link demand, therfore we must put the method call in a seperate method
+            that we can wrap in an exception handler.
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextProperties.declaringType">
+            <summary>
+            The fully qualified type of the LogicalThreadContextProperties class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextProperties.Item(System.String)">
+            <summary>
+            Gets or sets the value of a property
+            </summary>
+            <value>
+            The value for the property with the specified key
+            </value>
+            <remarks>
+            <para>
+            Get or set the property value for the <paramref name="key"/> specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.TwoArgAction`2">
+            <summary>
+            Delegate type used for LogicalThreadContextStack's callbacks.
+            </summary>
+        </member>
+        <member name="T:log4net.Util.LogicalThreadContextStack">
+            <summary>
+            Implementation of Stack for the <see cref="T:log4net.LogicalThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Implementation of Stack for the <see cref="T:log4net.LogicalThreadContext"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStack.m_stack">
+            <summary>
+            The stack store.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStack.m_propertyKey">
+            <summary>
+            The name of this <see cref="T:log4net.Util.LogicalThreadContextStack"/> within the
+            <see cref="T:log4net.Util.LogicalThreadContextProperties"/>.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStack.m_registerNew">
+            <summary>
+            The callback used to let the <see cref="T:log4net.Util.LogicalThreadContextStacks"/> register a
+            new instance of a <see cref="T:log4net.Util.LogicalThreadContextStack"/>.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.#ctor(System.String,log4net.Util.TwoArgAction{System.String,log4net.Util.LogicalThreadContextStack})">
+            <summary>
+            Internal constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.LogicalThreadContextStack"/> class. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.Clear">
+            <summary>
+            Clears all the contextual information held in this stack.
+            </summary>
+            <remarks>
+            <para>
+            Clears all the contextual information held in this stack.
+            Only call this if you think that this thread is being reused after
+            a previous call execution which may not have completed correctly.
+            You do not need to use this method if you always guarantee to call
+            the <see cref="M:System.IDisposable.Dispose"/> method of the <see cref="T:System.IDisposable"/>
+            returned from <see cref="M:log4net.Util.LogicalThreadContextStack.Push(System.String)"/> even in exceptional circumstances,
+            for example by using the <c>using(log4net.LogicalThreadContext.Stacks["NDC"].Push("Stack_Message"))</c> 
+            syntax.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.Pop">
+            <summary>
+            Removes the top context from this stack.
+            </summary>
+            <returns>The message in the context that was removed from the top of this stack.</returns>
+            <remarks>
+            <para>
+            Remove the top context from this stack, and return
+            it to the caller. If this stack is empty then an
+            empty string (not <see langword="null"/>) is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.Push(System.String)">
+            <summary>
+            Pushes a new context message into this stack.
+            </summary>
+            <param name="message">The new context message.</param>
+            <returns>
+            An <see cref="T:System.IDisposable"/> that can be used to clean up the context stack.
+            </returns>
+            <remarks>
+            <para>
+            Pushes a new context onto this stack. An <see cref="T:System.IDisposable"/>
+            is returned that can be used to clean up this stack. This
+            can be easily combined with the <c>using</c> keyword to scope the
+            context.
+            </para>
+            </remarks>
+            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
+            <code lang="C#">
+            using(log4net.LogicalThreadContext.Stacks["NDC"].Push("Stack_Message"))
+            {
+            	log.Warn("This should have an ThreadContext Stack message");
+            }
+            </code>
+            </example>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.GetFullMessage">
+            <summary>
+            Gets the current context information for this stack.
+            </summary>
+            <returns>The current context information.</returns>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.ToString">
+            <summary>
+            Gets the current context information for this stack.
+            </summary>
+            <returns>Gets the current context information</returns>
+            <remarks>
+            <para>
+            Gets the current context information for this stack.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.log4net#Core#IFixingRequired#GetFixedObject">
+            <summary>
+            Get a portable version of this object
+            </summary>
+            <returns>the portable instance of this object</returns>
+            <remarks>
+            <para>
+            Get a cross thread portable version of this object
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextStack.Count">
+            <summary>
+            The number of messages in the stack
+            </summary>
+            <value>
+            The current number of messages in the stack
+            </value>
+            <remarks>
+            <para>
+            The current number of messages in the stack. That is
+            the number of times <see cref="M:log4net.Util.LogicalThreadContextStack.Push(System.String)"/> has been called
+            minus the number of times <see cref="M:log4net.Util.LogicalThreadContextStack.Pop"/> has been called.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextStack.InternalStack">
+            <summary>
+            Gets and sets the internal stack used by this <see cref="T:log4net.Util.LogicalThreadContextStack"/>
+            </summary>
+            <value>The internal storage stack</value>
+            <remarks>
+            <para>
+            This property is provided only to support backward compatability 
+            of the <see cref="T:log4net.NDC"/>. Tytpically the internal stack should not
+            be modified.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogicalThreadContextStack.StackFrame">
+            <summary>
+            Inner class used to represent a single context frame in the stack.
+            </summary>
+            <remarks>
+            <para>
+            Inner class used to represent a single context frame in the stack.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.StackFrame.#ctor(System.String,log4net.Util.LogicalThreadContextStack.StackFrame)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">The message for this context.</param>
+            <param name="parent">The parent context in the chain.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.LogicalThreadContextStack.StackFrame"/> class
+            with the specified message and parent context.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextStack.StackFrame.Message">
+            <summary>
+            Get the message.
+            </summary>
+            <value>The message.</value>
+            <remarks>
+            <para>
+            Get the message.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextStack.StackFrame.FullMessage">
+            <summary>
+            Gets the full text of the context down to the root level.
+            </summary>
+            <value>
+            The full text of the context down to the root level.
+            </value>
+            <remarks>
+            <para>
+            Gets the full text of the context down to the root level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame">
+            <summary>
+            Struct returned from the <see cref="M:log4net.Util.LogicalThreadContextStack.Push(System.String)"/> method.
+            </summary>
+            <remarks>
+            <para>
+            This struct implements the <see cref="T:System.IDisposable"/> and is designed to be used
+            with the <see langword="using"/> pattern to remove the stack frame at the end of the scope.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame.m_frameDepth">
+            <summary>
+            The depth to trim the stack to when this instance is disposed
+            </summary>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame.m_logicalThreadContextStack">
+            <summary>
+            The outer LogicalThreadContextStack.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame.#ctor(log4net.Util.LogicalThreadContextStack,System.Int32)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="logicalThreadContextStack">The internal stack used by the ThreadContextStack.</param>
+            <param name="frameDepth">The depth to return the stack to when this object is disposed.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame"/> class with
+            the specified stack and return depth.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStack.AutoPopStackFrame.Dispose">
+            <summary>
+            Returns the stack to the correct depth.
+            </summary>
+            <remarks>
+            <para>
+            Returns the stack to the correct depth.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogicalThreadContextStacks">
+            <summary>
+            Implementation of Stacks collection for the <see cref="T:log4net.LogicalThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Implementation of Stacks collection for the <see cref="T:log4net.LogicalThreadContext"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.LogicalThreadContextStacks.#ctor(log4net.Util.LogicalThreadContextProperties)">
+            <summary>
+            Internal constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStacks"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.LogicalThreadContextStacks.declaringType">
+            <summary>
+            The fully qualified type of the ThreadContextStacks class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogicalThreadContextStacks.Item(System.String)">
+            <summary>
+            Gets the named thread context stack
+            </summary>
+            <value>
+            The named stack
+            </value>
+            <remarks>
+            <para>
+            Gets the named thread context stack
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogReceivedEventHandler">
+            <summary>
+            
+            </summary>
+            <param name="source"></param>
+            <param name="e"></param>
+        </member>
+        <member name="T:log4net.Util.LogLog">
+            <summary>
+            Outputs log statements from within the log4net assembly.
+            </summary>
+            <remarks>
+            <para>
+            Log4net components cannot make log4net logging calls. However, it is
+            sometimes useful for the user to learn about what log4net is
+            doing.
+            </para>
+            <para>
+            All log4net internal debug calls go to the standard output stream
+            whereas internal error messages are sent to the standard error output 
+            stream.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.LogLog.ToString">
+            <summary>
+            Formats Prefix, Source, and Message in the same format as the value
+            sent to Console.Out and Trace.Write.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Util.LogLog.#ctor(System.Type,System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.LogLog"/> class. 
+            </summary>
+            <param name="source"></param>
+            <param name="prefix"></param>
+            <param name="message"></param>
+            <param name="exception"></param>
+        </member>
+        <member name="M:log4net.Util.LogLog.#cctor">
+            <summary>
+            Static constructor that initializes logging by reading 
+            settings from the application configuration file.
+            </summary>
+            <remarks>
+            <para>
+            The <c>log4net.Internal.Debug</c> application setting
+            controls internal debugging. This setting should be set
+            to <c>true</c> to enable debugging.
+            </para>
+            <para>
+            The <c>log4net.Internal.Quiet</c> application setting
+            suppresses all internal logging including error messages. 
+            This setting should be set to <c>true</c> to enable message
+            suppression.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.OnLogReceived(System.Type,System.String,System.String,System.Exception)">
+            <summary>
+            Raises the LogReceived event when an internal messages is received.
+            </summary>
+            <param name="source"></param>
+            <param name="prefix"></param>
+            <param name="message"></param>
+            <param name="exception"></param>
+        </member>
+        <member name="M:log4net.Util.LogLog.Debug(System.Type,System.String)">
+            <summary>
+            Writes log4net internal debug messages to the 
+            standard output stream.
+            </summary>
+            <param name="source"></param>
+            <param name="message">The message to log.</param>
+            <remarks>
+            <para>
+            All internal debug messages are prepended with 
+            the string "log4net: ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.Debug(System.Type,System.String,System.Exception)">
+            <summary>
+            Writes log4net internal debug messages to the 
+            standard output stream.
+            </summary>
+            <param name="source">The Type that generated this message.</param>
+            <param name="message">The message to log.</param>
+            <param name="exception">An exception to log.</param>
+            <remarks>
+            <para>
+            All internal debug messages are prepended with 
+            the string "log4net: ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.Warn(System.Type,System.String)">
+            <summary>
+            Writes log4net internal warning messages to the 
+            standard error stream.
+            </summary>
+            <param name="source">The Type that generated this message.</param>
+            <param name="message">The message to log.</param>
+            <remarks>
+            <para>
+            All internal warning messages are prepended with 
+            the string "log4net:WARN ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.Warn(System.Type,System.String,System.Exception)">
+            <summary>
+            Writes log4net internal warning messages to the 
+            standard error stream.
+            </summary>
+            <param name="source">The Type that generated this message.</param>
+            <param name="message">The message to log.</param>
+            <param name="exception">An exception to log.</param>
+            <remarks>
+            <para>
+            All internal warning messages are prepended with 
+            the string "log4net:WARN ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.Error(System.Type,System.String)">
+            <summary>
+            Writes log4net internal error messages to the 
+            standard error stream.
+            </summary>
+            <param name="source">The Type that generated this message.</param>
+            <param name="message">The message to log.</param>
+            <remarks>
+            <para>
+            All internal error messages are prepended with 
+            the string "log4net:ERROR ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.Error(System.Type,System.String,System.Exception)">
+            <summary>
+            Writes log4net internal error messages to the 
+            standard error stream.
+            </summary>
+            <param name="source">The Type that generated this message.</param>
+            <param name="message">The message to log.</param>
+            <param name="exception">An exception to log.</param>
+            <remarks>
+            <para>
+            All internal debug messages are prepended with 
+            the string "log4net:ERROR ".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.EmitOutLine(System.String)">
+            <summary>
+            Writes output to the standard output stream.  
+            </summary>
+            <param name="message">The message to log.</param>
+            <remarks>
+            <para>
+            Writes to both Console.Out and System.Diagnostics.Trace.
+            Note that the System.Diagnostics.Trace is not supported
+            on the Compact Framework.
+            </para>
+            <para>
+            If the AppDomain is not configured with a config file then
+            the call to System.Diagnostics.Trace may fail. This is only
+            an issue if you are programmatically creating your own AppDomains.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.LogLog.EmitErrorLine(System.String)">
+            <summary>
+            Writes output to the standard error stream.  
+            </summary>
+            <param name="message">The message to log.</param>
+            <remarks>
+            <para>
+            Writes to both Console.Error and System.Diagnostics.Trace.
+            Note that the System.Diagnostics.Trace is not supported
+            on the Compact Framework.
+            </para>
+            <para>
+            If the AppDomain is not configured with a config file then
+            the call to System.Diagnostics.Trace may fail. This is only
+            an issue if you are programmatically creating your own AppDomains.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.LogLog.s_debugEnabled">
+            <summary>
+             Default debug level
+            </summary>
+        </member>
+        <member name="F:log4net.Util.LogLog.s_quietMode">
+            <summary>
+            In quietMode not even errors generate any output.
+            </summary>
+        </member>
+        <member name="E:log4net.Util.LogLog.LogReceived">
+            <summary>
+            The event raised when an internal message has been received.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.Source">
+            <summary>
+            The Type that generated the internal message.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.TimeStamp">
+            <summary>
+            The DateTime stamp of when the internal message was received.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.TimeStampUtc">
+            <summary>
+            The UTC DateTime stamp of when the internal message was received.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.Prefix">
+            <summary>
+            A string indicating the severity of the internal message.
+            </summary>
+            <remarks>
+            "log4net: ", 
+            "log4net:ERROR ", 
+            "log4net:WARN "
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogLog.Message">
+            <summary>
+            The internal log message.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.Exception">
+            <summary>
+            The Exception related to the message.
+            </summary>
+            <remarks>
+            Optional. Will be null if no Exception was passed.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogLog.InternalDebugging">
+            <summary>
+            Gets or sets a value indicating whether log4net internal logging
+            is enabled or disabled.
+            </summary>
+            <value>
+            <c>true</c> if log4net internal logging is enabled, otherwise 
+            <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            When set to <c>true</c>, internal debug level logging will be 
+            displayed.
+            </para>
+            <para>
+            This value can be set by setting the application setting 
+            <c>log4net.Internal.Debug</c> in the application configuration
+            file.
+            </para>
+            <para>
+            The default value is <c>false</c>, i.e. debugging is
+            disabled.
+            </para>
+            </remarks>
+            <example>
+            <para>
+            The following example enables internal debugging using the 
+            application configuration file :
+            </para>
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net.Internal.Debug" value="true" />
+            	</appSettings>
+            </configuration>
+            </code>
+            </example>
+        </member>
+        <member name="P:log4net.Util.LogLog.QuietMode">
+            <summary>
+            Gets or sets a value indicating whether log4net should generate no output
+            from internal logging, not even for errors. 
+            </summary>
+            <value>
+            <c>true</c> if log4net should generate no output at all from internal 
+            logging, otherwise <c>false</c>.
+            </value>
+            <remarks>
+            <para>
+            When set to <c>true</c> will cause internal logging at all levels to be 
+            suppressed. This means that no warning or error reports will be logged. 
+            This option overrides the <see cref="P:log4net.Util.LogLog.InternalDebugging"/> setting and 
+            disables all debug also.
+            </para>
+            <para>This value can be set by setting the application setting
+            <c>log4net.Internal.Quiet</c> in the application configuration file.
+            </para>
+            <para>
+            The default value is <c>false</c>, i.e. internal logging is not
+            disabled.
+            </para>
+            </remarks>
+            <example>
+            The following example disables internal logging using the 
+            application configuration file :
+            <code lang="XML" escaped="true">
+            <configuration>
+            	<appSettings>
+            		<add key="log4net.Internal.Quiet" value="true"/>
+            	</appSettings>
+            </configuration>
+            </code>
+            </example>
+        </member>
+        <member name="P:log4net.Util.LogLog.EmitInternalMessages">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.IsDebugEnabled">
+            <summary>
+            Test if LogLog.Debug is enabled for output.
+            </summary>
+            <value>
+            <c>true</c> if Debug is enabled
+            </value>
+            <remarks>
+            <para>
+            Test if LogLog.Debug is enabled for output.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogLog.IsWarnEnabled">
+            <summary>
+            Test if LogLog.Warn is enabled for output.
+            </summary>
+            <value>
+            <c>true</c> if Warn is enabled
+            </value>
+            <remarks>
+            <para>
+            Test if LogLog.Warn is enabled for output.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.LogLog.IsErrorEnabled">
+            <summary>
+            Test if LogLog.Error is enabled for output.
+            </summary>
+            <value>
+            <c>true</c> if Error is enabled
+            </value>
+            <remarks>
+            <para>
+            Test if LogLog.Error is enabled for output.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.LogLog.LogReceivedAdapter">
+            <summary>
+            Subscribes to the LogLog.LogReceived event and stores messages
+            to the supplied IList instance.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.LogLog.LogReceivedAdapter.#ctor(System.Collections.IList)">
+            <summary>
+            
+            </summary>
+            <param name="items"></param>
+        </member>
+        <member name="M:log4net.Util.LogLog.LogReceivedAdapter.Dispose">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:log4net.Util.LogLog.LogReceivedAdapter.Items">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:log4net.Util.LogReceivedEventArgs">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:log4net.Util.LogReceivedEventArgs.#ctor(log4net.Util.LogLog)">
+            <summary>
+            
+            </summary>
+            <param name="loglog"></param>
+        </member>
+        <member name="P:log4net.Util.LogReceivedEventArgs.LogLog">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:log4net.Util.NativeError">
+            <summary>
+            Represents a native error code and message.
+            </summary>
+            <remarks>
+            <para>
+            Represents a Win32 platform native error.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.NativeError.#ctor(System.Int32,System.String)">
+            <summary>
+            Create an instance of the <see cref="T:log4net.Util.NativeError"/> class with the specified 
+            error number and message.
+            </summary>
+            <param name="number">The number of the native error.</param>
+            <param name="message">The message of the native error.</param>
+            <remarks>
+            <para>
+            Create an instance of the <see cref="T:log4net.Util.NativeError"/> class with the specified 
+            error number and message.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NativeError.GetLastError">
+            <summary>
+            Create a new instance of the <see cref="T:log4net.Util.NativeError"/> class for the last Windows error.
+            </summary>
+            <returns>
+            An instance of the <see cref="T:log4net.Util.NativeError"/> class for the last windows error.
+            </returns>
+            <remarks>
+            <para>
+            The message for the <see cref="M:System.Runtime.InteropServices.Marshal.GetLastWin32Error"/> error number is lookup up using the 
+            native Win32 <c>FormatMessage</c> function.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NativeError.GetError(System.Int32)">
+            <summary>
+            Create a new instance of the <see cref="T:log4net.Util.NativeError"/> class.
+            </summary>
+            <param name="number">the error number for the native error</param>
+            <returns>
+            An instance of the <see cref="T:log4net.Util.NativeError"/> class for the specified 
+            error number.
+            </returns>
+            <remarks>
+            <para>
+            The message for the specified error number is lookup up using the 
+            native Win32 <c>FormatMessage</c> function.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NativeError.GetErrorMessage(System.Int32)">
+            <summary>
+            Retrieves the message corresponding with a Win32 message identifier.
+            </summary>
+            <param name="messageId">Message identifier for the requested message.</param>
+            <returns>
+            The message corresponding with the specified message identifier.
+            </returns>
+            <remarks>
+            <para>
+            The message will be searched for in system message-table resource(s)
+            using the native <c>FormatMessage</c> function.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NativeError.ToString">
+            <summary>
+            Return error information string
+            </summary>
+            <returns>error information string</returns>
+            <remarks>
+            <para>
+            Return error information string
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NativeError.FormatMessage(System.Int32,System.IntPtr@,System.Int32,System.Int32,System.String@,System.Int32,System.IntPtr)">
+            <summary>
+            Formats a message string.
+            </summary>
+            <param name="dwFlags">Formatting options, and how to interpret the <paramref name="lpSource" /> parameter.</param>
+            <param name="lpSource">Location of the message definition.</param>
+            <param name="dwMessageId">Message identifier for the requested message.</param>
+            <param name="dwLanguageId">Language identifier for the requested message.</param>
+            <param name="lpBuffer">If <paramref name="dwFlags" /> includes FORMAT_MESSAGE_ALLOCATE_BUFFER, the function allocates a buffer using the <c>LocalAlloc</c> function, and places the pointer to the buffer at the address specified in <paramref name="lpBuffer" />.</param>
+            <param name="nSize">If the FORMAT_MESSAGE_ALLOCATE_BUFFER flag is not set, this parameter specifies the maximum number of TCHARs that can be stored in the output buffer. If FORMAT_MESSAGE_ALLOCATE_BUFFER is set, this parameter specifies the minimum number of TCHARs to allocate for an output buffer.</param>
+            <param name="Arguments">Pointer to an array of values that are used as insert values in the formatted message.</param>
+            <remarks>
+            <para>
+            The function requires a message definition as input. The message definition can come from a 
+            buffer passed into the function. It can come from a message table resource in an 
+            already-loaded module. Or the caller can ask the function to search the system's message 
+            table resource(s) for the message definition. The function finds the message definition 
+            in a message table resource based on a message identifier and a language identifier. 
+            The function copies the formatted message text to an output buffer, processing any embedded 
+            insert sequences if requested.
+            </para>
+            <para>
+            To prevent the usage of unsafe code, this stub does not support inserting values in the formatted message.
+            </para>
+            </remarks>
+            <returns>
+            <para>
+            If the function succeeds, the return value is the number of TCHARs stored in the output 
+            buffer, excluding the terminating null character.
+            </para>
+            <para>
+            If the function fails, the return value is zero. To get extended error information, 
+            call <see cref="M:Marshal.GetLastWin32Error()" />.
+            </para>
+            </returns>
+        </member>
+        <member name="P:log4net.Util.NativeError.Number">
+            <summary>
+            Gets the number of the native error.
+            </summary>
+            <value>
+            The number of the native error.
+            </value>
+            <remarks>
+            <para>
+            Gets the number of the native error.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.NativeError.Message">
+            <summary>
+            Gets the message of the native error.
+            </summary>
+            <value>
+            The message of the native error.
+            </value>
+            <remarks>
+            <para>
+            </para>
+            Gets the message of the native error.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.NullDictionaryEnumerator">
+            <summary>
+            An always empty <see cref="T:System.Collections.IDictionaryEnumerator"/>.
+            </summary>
+            <remarks>
+            <para>
+            A singleton implementation of the <see cref="T:System.Collections.IDictionaryEnumerator"/> over a collection
+            that is empty and not modifiable.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.NullDictionaryEnumerator.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to enforce the singleton pattern.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullDictionaryEnumerator.MoveNext">
+            <summary>
+            Test if the enumerator can advance, if so advance.
+            </summary>
+            <returns><c>false</c> as the <see cref="T:log4net.Util.NullDictionaryEnumerator"/> cannot advance.</returns>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="M:log4net.Util.NullDictionaryEnumerator.MoveNext"/>
+            will always return <c>false</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullDictionaryEnumerator.Reset">
+            <summary>
+            Resets the enumerator back to the start.
+            </summary>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection <see cref="M:log4net.Util.NullDictionaryEnumerator.Reset"/> does nothing.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.NullDictionaryEnumerator.s_instance">
+            <summary>
+            The singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.NullDictionaryEnumerator.Instance">
+            <summary>
+            Gets the singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
+            </summary>
+            <returns>The singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.</returns>
+            <remarks>
+            <para>
+            Gets the singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.NullDictionaryEnumerator.Current">
+            <summary>
+            Gets the current object from the enumerator.
+            </summary>
+            <remarks>
+            Throws an <see cref="T:System.InvalidOperationException"/> because the 
+            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
+            </remarks>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            will throw an <see cref="T:System.InvalidOperationException"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
+            cannot be positioned over a valid location.</exception>
+        </member>
+        <member name="P:log4net.Util.NullDictionaryEnumerator.Key">
+            <summary>
+            Gets the current key from the enumerator.
+            </summary>
+            <remarks>
+            Throws an exception because the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>
+            never has a current value.
+            </remarks>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Key"/>
+            will throw an <see cref="T:System.InvalidOperationException"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
+            cannot be positioned over a valid location.</exception>
+        </member>
+        <member name="P:log4net.Util.NullDictionaryEnumerator.Value">
+            <summary>
+            Gets the current value from the enumerator.
+            </summary>
+            <value>The current value from the enumerator.</value>
+            <remarks>
+            Throws an <see cref="T:System.InvalidOperationException"/> because the 
+            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
+            </remarks>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Value"/>
+            will throw an <see cref="T:System.InvalidOperationException"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
+            cannot be positioned over a valid location.</exception>
+        </member>
+        <member name="P:log4net.Util.NullDictionaryEnumerator.Entry">
+            <summary>
+            Gets the current entry from the enumerator.
+            </summary>
+            <remarks>
+            Throws an <see cref="T:System.InvalidOperationException"/> because the 
+            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current entry.
+            </remarks>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Entry"/>
+            will throw an <see cref="T:System.InvalidOperationException"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
+            cannot be positioned over a valid location.</exception>
+        </member>
+        <member name="T:log4net.Util.NullEnumerator">
+            <summary>
+            An always empty <see cref="T:System.Collections.IEnumerator"/>.
+            </summary>
+            <remarks>
+            <para>
+            A singleton implementation of the <see cref="T:System.Collections.IEnumerator"/> over a collection
+            that is empty and not modifiable.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.NullEnumerator.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.NullEnumerator"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to enforce the singleton pattern.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullEnumerator.MoveNext">
+            <summary>
+            Test if the enumerator can advance, if so advance
+            </summary>
+            <returns><c>false</c> as the <see cref="T:log4net.Util.NullEnumerator"/> cannot advance.</returns>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="M:log4net.Util.NullEnumerator.MoveNext"/>
+            will always return <c>false</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullEnumerator.Reset">
+            <summary>
+            Resets the enumerator back to the start.
+            </summary>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection <see cref="M:log4net.Util.NullEnumerator.Reset"/> does nothing.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.NullEnumerator.s_instance">
+            <summary>
+            The singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.NullEnumerator.Instance">
+            <summary>
+            Get the singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
+            </summary>
+            <returns>The singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.</returns>
+            <remarks>
+            <para>
+            Gets the singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.NullEnumerator.Current">
+            <summary>
+            Gets the current object from the enumerator.
+            </summary>
+            <remarks>
+            Throws an <see cref="T:System.InvalidOperationException"/> because the 
+            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
+            </remarks>
+            <remarks>
+            <para>
+            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullEnumerator.Current"/>
+            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullEnumerator.Current"/>
+            will throw an <see cref="T:System.InvalidOperationException"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullEnumerator.Current"/> 
+            cannot be positioned over a valid location.</exception>
+        </member>
+        <member name="T:log4net.Util.NullSecurityContext">
+            <summary>
+            A SecurityContext used when a SecurityContext is not required
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Util.NullSecurityContext"/> is a no-op implementation of the
+            <see cref="T:log4net.Core.SecurityContext"/> base class. It is used where a <see cref="T:log4net.Core.SecurityContext"/>
+            is required but one has not been provided.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.NullSecurityContext.Instance">
+            <summary>
+            Singleton instance of <see cref="T:log4net.Util.NullSecurityContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Singleton instance of <see cref="T:log4net.Util.NullSecurityContext"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullSecurityContext.#ctor">
+            <summary>
+            Private constructor
+            </summary>
+            <remarks>
+            <para>
+            Private constructor for singleton pattern.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.NullSecurityContext.Impersonate(System.Object)">
+            <summary>
+            Impersonate this SecurityContext
+            </summary>
+            <param name="state">State supplied by the caller</param>
+            <returns><c>null</c></returns>
+            <remarks>
+            <para>
+            No impersonation is done and <c>null</c> is always returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.OnlyOnceErrorHandler">
+            <summary>
+            Implements log4net's default error handling policy which consists 
+            of emitting a message for the first error in an appender and 
+            ignoring all subsequent errors.
+            </summary>
+            <remarks>
+            <para>
+            The error message is processed using the LogLog sub-system by default.
+            </para>
+            <para>
+            This policy aims at protecting an otherwise working application
+            from being flooded with error messages when logging fails.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Ron Grabowski</author>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.#ctor">
+            <summary>
+            Default Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="prefix">The prefix to use for each message.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/> class
+            with the specified prefix.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.Reset">
+            <summary>
+            Reset the error handler back to its initial disabled state.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)">
+            <summary>
+            Log an Error
+            </summary>
+            <param name="message">The error message.</param>
+            <param name="e">The exception.</param>
+            <param name="errorCode">The internal error code.</param>
+            <remarks>
+            <para>
+            Invokes <see cref="M:log4net.Util.OnlyOnceErrorHandler.FirstError(System.String,System.Exception,log4net.Core.ErrorCode)"/> if and only if this is the first error or the first error after <see cref="M:log4net.Util.OnlyOnceErrorHandler.Reset"/> has been called.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.FirstError(System.String,System.Exception,log4net.Core.ErrorCode)">
+            <summary>
+            Log the very first error
+            </summary>
+            <param name="message">The error message.</param>
+            <param name="e">The exception.</param>
+            <param name="errorCode">The internal error code.</param>
+            <remarks>
+            <para>
+            Sends the error information to <see cref="T:log4net.Util.LogLog"/>'s Error method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String,System.Exception)">
+            <summary>
+            Log an Error
+            </summary>
+            <param name="message">The error message.</param>
+            <param name="e">The exception.</param>
+            <remarks>
+            <para>
+            Invokes <see cref="M:log4net.Util.OnlyOnceErrorHandler.FirstError(System.String,System.Exception,log4net.Core.ErrorCode)"/> if and only if this is the first error or the first error after <see cref="M:log4net.Util.OnlyOnceErrorHandler.Reset"/> has been called.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String)">
+            <summary>
+            Log an error
+            </summary>
+            <param name="message">The error message.</param>
+            <remarks>
+            <para>
+            Invokes <see cref="M:log4net.Util.OnlyOnceErrorHandler.FirstError(System.String,System.Exception,log4net.Core.ErrorCode)"/> if and only if this is the first error or the first error after <see cref="M:log4net.Util.OnlyOnceErrorHandler.Reset"/> has been called.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_enabledDateUtc">
+            <summary>
+            The UTC date the error was recorded.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_firstTime">
+            <summary>
+            Flag to indicate if it is the first error
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_message">
+            <summary>
+            The message recorded during the first error.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_exception">
+            <summary>
+            The exception recorded during the first error.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_errorCode">
+            <summary>
+            The error code recorded during the first error.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_prefix">
+            <summary>
+            String to prefix each message with
+            </summary>
+        </member>
+        <member name="F:log4net.Util.OnlyOnceErrorHandler.declaringType">
+            <summary>
+            The fully qualified type of the OnlyOnceErrorHandler class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.IsEnabled">
+            <summary>
+            Is error logging enabled
+            </summary>
+            <remarks>
+            <para>
+            Is error logging enabled. Logging is only enabled for the
+            first error delivered to the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.EnabledDate">
+            <summary>
+            The date the first error that trigged this error handler occurred, or <see cref="F:System.DateTime.MinValue"/> if it has not been triggered.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.EnabledDateUtc">
+            <summary>
+            The UTC date the first error that trigged this error handler occured, or <see cref="F:System.DateTime.MinValue"/> if it has not been triggered.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.ErrorMessage">
+            <summary>
+            The message from the first error that trigged this error handler.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.Exception">
+            <summary>
+            The exception from the first error that trigged this error handler.
+            </summary>
+            <remarks>
+            May be <see langword="null" />.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.OnlyOnceErrorHandler.ErrorCode">
+            <summary>
+            The error code from the first error that trigged this error handler.
+            </summary>
+            <remarks>
+            Defaults to <see cref="F:log4net.Core.ErrorCode.GenericFailure"/>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.OptionConverter">
+            <summary>
+            A convenience class to convert property values to specific types.
+            </summary>
+            <remarks>
+            <para>
+            Utility functions for converting types and parsing values.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.OptionConverter"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to prevent instantiation of this class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.ToBoolean(System.String,System.Boolean)">
+            <summary>
+            Converts a string to a <see cref="T:System.Boolean"/> value.
+            </summary>
+            <param name="argValue">String to convert.</param>
+            <param name="defaultValue">The default value.</param>
+            <returns>The <see cref="T:System.Boolean"/> value of <paramref name="argValue"/>.</returns>
+            <remarks>
+            <para>
+            If <paramref name="argValue"/> is "true", then <c>true</c> is returned. 
+            If <paramref name="argValue"/> is "false", then <c>false</c> is returned. 
+            Otherwise, <paramref name="defaultValue"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.ToFileSize(System.String,System.Int64)">
+            <summary>
+            Parses a file size into a number.
+            </summary>
+            <param name="argValue">String to parse.</param>
+            <param name="defaultValue">The default value.</param>
+            <returns>The <see cref="T:System.Int64"/> value of <paramref name="argValue"/>.</returns>
+            <remarks>
+            <para>
+            Parses a file size of the form: number[KB|MB|GB] into a
+            long value. It is scaled with the appropriate multiplier.
+            </para>
+            <para>
+            <paramref name="defaultValue"/> is returned when <paramref name="argValue"/>
+            cannot be converted to a <see cref="T:System.Int64"/> value.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.ConvertStringTo(System.Type,System.String)">
+            <summary>
+            Converts a string to an object.
+            </summary>
+            <param name="target">The target type to convert to.</param>
+            <param name="txt">The string to convert to an object.</param>
+            <returns>
+            The object converted from a string or <c>null</c> when the 
+            conversion failed.
+            </returns>
+            <remarks>
+            <para>
+            Converts a string to an object. Uses the converter registry to try
+            to convert the string value into the specified target type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.CanConvertTypeTo(System.Type,System.Type)">
+            <summary>
+            Checks if there is an appropriate type conversion from the source type to the target type.
+            </summary>
+            <param name="sourceType">The type to convert from.</param>
+            <param name="targetType">The type to convert to.</param>
+            <returns><c>true</c> if there is a conversion from the source type to the target type.</returns>
+            <remarks>
+            Checks if there is an appropriate type conversion from the source type to the target type.
+            <para>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.ConvertTypeTo(System.Object,System.Type)">
+            <summary>
+            Converts an object to the target type.
+            </summary>
+            <param name="sourceInstance">The object to convert to the target type.</param>
+            <param name="targetType">The type to convert to.</param>
+            <returns>The converted object.</returns>
+            <remarks>
+            <para>
+            Converts an object to the target type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.InstantiateByClassName(System.String,System.Type,System.Object)">
+            <summary>
+            Instantiates an object given a class name.
+            </summary>
+            <param name="className">The fully qualified class name of the object to instantiate.</param>
+            <param name="superClass">The class to which the new object should belong.</param>
+            <param name="defaultValue">The object to return in case of non-fulfillment.</param>
+            <returns>
+            An instance of the <paramref name="className"/> or <paramref name="defaultValue"/>
+            if the object could not be instantiated.
+            </returns>
+            <remarks>
+            <para>
+            Checks that the <paramref name="className"/> is a subclass of
+            <paramref name="superClass"/>. If that test fails or the object could
+            not be instantiated, then <paramref name="defaultValue"/> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.SubstituteVariables(System.String,System.Collections.IDictionary)">
+            <summary>
+            Performs variable substitution in string <paramref name="value"/> from the 
+            values of keys found in <paramref name="props"/>.
+            </summary>
+            <param name="value">The string on which variable substitution is performed.</param>
+            <param name="props">The dictionary to use to lookup variables.</param>
+            <returns>The result of the substitutions.</returns>
+            <remarks>
+            <para>
+            The variable substitution delimiters are <b>${</b> and <b>}</b>.
+            </para>
+            <para>
+            For example, if props contains <c>key=value</c>, then the call
+            </para>
+            <para>
+            <code lang="C#">
+            string s = OptionConverter.SubstituteVariables("Value of key is ${key}.");
+            </code>
+            </para>
+            <para>
+            will set the variable <c>s</c> to "Value of key is value.".
+            </para>
+            <para>
+            If no value could be found for the specified key, then substitution 
+            defaults to an empty string.
+            </para>
+            <para>
+            For example, if system properties contains no value for the key
+            "nonExistentKey", then the call
+            </para>
+            <para>
+            <code lang="C#">
+            string s = OptionConverter.SubstituteVariables("Value of nonExistentKey is [${nonExistentKey}]");
+            </code>
+            </para>
+            <para>
+            will set <s>s</s> to "Value of nonExistentKey is []".	 
+            </para>
+            <para>
+            An Exception is thrown if <paramref name="value"/> contains a start 
+            delimiter "${" which is not balanced by a stop delimiter "}". 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.OptionConverter.ParseEnum(System.Type,System.String,System.Boolean)">
+            <summary>
+            Converts the string representation of the name or numeric value of one or 
+            more enumerated constants to an equivalent enumerated object.
+            </summary>
+            <param name="enumType">The type to convert to.</param>
+            <param name="value">The enum string value.</param>
+            <param name="ignoreCase">If <c>true</c>, ignore case; otherwise, regard case.</param>
+            <returns>An object of type <paramref name="enumType" /> whose value is represented by <paramref name="value" />.</returns>
+        </member>
+        <member name="F:log4net.Util.OptionConverter.declaringType">
+            <summary>
+            The fully qualified type of the OptionConverter class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternParser">
+            <summary>
+            Most of the work of the <see cref="T:log4net.Layout.PatternLayout"/> class
+            is delegated to the PatternParser class.
+            </summary>
+            <remarks>
+            <para>
+            The <c>PatternParser</c> processes a pattern string and
+            returns a chain of <see cref="T:log4net.Util.PatternConverter"/> objects.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.PatternParser.#ctor(System.String)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="pattern">The pattern to parse.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.PatternParser"/> class 
+            with the specified pattern string.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternParser.Parse">
+            <summary>
+            Parses the pattern into a chain of pattern converters.
+            </summary>
+            <returns>The head of a chain of pattern converters.</returns>
+            <remarks>
+            <para>
+            Parses the pattern into a chain of pattern converters.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternParser.BuildCache">
+            <summary>
+            Build the unified cache of converters from the static and instance maps
+            </summary>
+            <returns>the list of all the converter names</returns>
+            <remarks>
+            <para>
+            Build the unified cache of converters from the static and instance maps
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternParser.ParseInternal(System.String,System.String[])">
+            <summary>
+            Internal method to parse the specified pattern to find specified matches
+            </summary>
+            <param name="pattern">the pattern to parse</param>
+            <param name="matches">the converter names to match in the pattern</param>
+            <remarks>
+            <para>
+            The matches param must be sorted such that longer strings come before shorter ones.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternParser.ProcessLiteral(System.String)">
+            <summary>
+            Process a parsed literal
+            </summary>
+            <param name="text">the literal text</param>
+        </member>
+        <member name="M:log4net.Util.PatternParser.ProcessConverter(System.String,System.String,log4net.Util.FormattingInfo)">
+            <summary>
+            Process a parsed converter pattern
+            </summary>
+            <param name="converterName">the name of the converter</param>
+            <param name="option">the optional option for the converter</param>
+            <param name="formattingInfo">the formatting info for the converter</param>
+        </member>
+        <member name="M:log4net.Util.PatternParser.AddConverter(log4net.Util.PatternConverter)">
+            <summary>
+            Resets the internal state of the parser and adds the specified pattern converter 
+            to the chain.
+            </summary>
+            <param name="pc">The pattern converter to add.</param>
+        </member>
+        <member name="F:log4net.Util.PatternParser.m_head">
+            <summary>
+            The first pattern converter in the chain
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternParser.m_tail">
+            <summary>
+             the last pattern converter in the chain
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternParser.m_pattern">
+            <summary>
+            The pattern
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternParser.m_patternConverters">
+            <summary>
+            Internal map of converter identifiers to converter types
+            </summary>
+            <remarks>
+            <para>
+            This map overrides the static s_globalRulesRegistry map.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.PatternParser.declaringType">
+            <summary>
+            The fully qualified type of the PatternParser class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternParser.PatternConverters">
+            <summary>
+            Get the converter registry used by this parser
+            </summary>
+            <value>
+            The converter registry used by this parser
+            </value>
+            <remarks>
+            <para>
+            Get the converter registry used by this parser
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternParser.StringLengthComparer">
+            <summary>
+            Sort strings by length
+            </summary>
+            <remarks>
+            <para>
+            <see cref="T:System.Collections.IComparer"/> that orders strings by string length.
+            The longest strings are placed first
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PatternString">
+            <summary>
+            This class implements a patterned string.
+            </summary>
+            <remarks>
+            <para>
+            This string has embedded patterns that are resolved and expanded
+            when the string is formatted.
+            </para>
+            <para>
+            This class functions similarly to the <see cref="T:log4net.Layout.PatternLayout"/>
+            in that it accepts a pattern and renders it to a string. Unlike the 
+            <see cref="T:log4net.Layout.PatternLayout"/> however the <c>PatternString</c>
+            does not render the properties of a specific <see cref="T:log4net.Core.LoggingEvent"/> but
+            of the process in general.
+            </para>
+            <para>
+            The recognized conversion pattern names are:
+            </para>
+            <list type="table">
+                <listheader>
+                    <term>Conversion Pattern Name</term>
+                    <description>Effect</description>
+                </listheader>
+                <item>
+                    <term>appdomain</term>
+                    <description>
+                        <para>
+                        Used to output the friendly name of the current AppDomain.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>appsetting</term>
+                    <description>
+                        <para>
+                        Used to output the value of a specific appSetting key in the application
+                        configuration file.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>date</term>
+                    <description>
+            			<para>
+            			Used to output the current date and time in the local time zone. 
+            			To output the date in universal time use the <c>%utcdate</c> pattern.
+            			The date conversion 
+            			specifier may be followed by a <i>date format specifier</i> enclosed 
+            			between braces. For example, <b>%date{HH:mm:ss,fff}</b> or
+            			<b>%date{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
+            			given then ISO8601 format is
+            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
+            			</para>
+            			<para>
+            			The date format specifier admits the same syntax as the
+            			time pattern string of the <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            			<para>
+            			For better results it is recommended to use the log4net date
+            			formatters. These can be specified using one of the strings
+            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
+            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
+            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
+            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
+            			<b>%date{ISO8601}</b> or <b>%date{ABSOLUTE}</b>.
+            			</para>
+            			<para>
+            			These dedicated date formatters perform significantly
+            			better than <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+                    </description>
+                </item>
+                <item>
+                    <term>env</term>
+                    <description>
+                        <para>
+            			Used to output the a specific environment variable. The key to 
+            			lookup must be specified within braces and directly following the
+            			pattern specifier, e.g. <b>%env{COMPUTERNAME}</b> would include the value
+            			of the <c>COMPUTERNAME</c> environment variable.
+                        </para>
+                        <para>
+                        The <c>env</c> pattern is not supported on the .NET Compact Framework.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>identity</term>
+                    <description>
+            			<para>
+            			Used to output the user name for the currently active user
+            			(Principal.Identity.Name).
+            			</para>
+                    </description>
+                </item>
+                <item>
+                    <term>newline</term>
+                    <description>
+            			<para>
+            			Outputs the platform dependent line separator character or
+            			characters.
+            			</para>
+            			<para>
+            			This conversion pattern name offers the same performance as using 
+            			non-portable line separator strings such as	"\n", or "\r\n". 
+            			Thus, it is the preferred way of specifying a line separator.
+            			</para> 
+                    </description>
+                </item>
+                <item>
+                    <term>processid</term>
+                    <description>
+                        <para>
+            			Used to output the system process ID for the current process.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>property</term>
+                    <description>
+            			<para>
+            			Used to output a specific context property. The key to 
+            			lookup must be specified within braces and directly following the
+            			pattern specifier, e.g. <b>%property{user}</b> would include the value
+            			from the property that is keyed by the string 'user'. Each property value
+            			that is to be included in the log must be specified separately.
+            			Properties are stored in logging contexts. By default 
+            			the <c>log4net:HostName</c> property is set to the name of machine on 
+            			which the event was originally logged.
+            			</para>
+            			<para>
+            			If no key is specified, e.g. <b>%property</b> then all the keys and their
+            			values are printed in a comma separated list.
+            			</para>
+            			<para>
+            			The properties of an event are combined from a number of different
+            			contexts. These are listed below in the order in which they are searched.
+            			</para>
+            			<list type="definition">
+            				<item>
+            					<term>the thread properties</term>
+            					<description>
+            					The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
+            					thread. These properties are shared by all events logged on this thread.
+            					</description>
+            				</item>
+            				<item>
+            					<term>the global properties</term>
+            					<description>
+            					The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
+            					properties are shared by all the threads in the AppDomain.
+            					</description>
+            				</item>
+            			</list>
+                    </description>
+                </item>
+                <item>
+                    <term>random</term>
+                    <description>
+                        <para>
+                        Used to output a random string of characters. The string is made up of
+                        uppercase letters and numbers. By default the string is 4 characters long.
+                        The length of the string can be specified within braces directly following the
+            			pattern specifier, e.g. <b>%random{8}</b> would output an 8 character string.
+                        </para>
+                    </description>
+                </item>
+                <item>
+                    <term>username</term>
+                    <description>
+            			<para>
+            			Used to output the WindowsIdentity for the currently
+            			active user.
+            			</para>
+                    </description>
+                </item>
+                <item>
+                    <term>utcdate</term>
+                    <description>
+            			<para>
+            			Used to output the date of the logging event in universal time. 
+            			The date conversion 
+            			specifier may be followed by a <i>date format specifier</i> enclosed 
+            			between braces. For example, <b>%utcdate{HH:mm:ss,fff}</b> or
+            			<b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
+            			given then ISO8601 format is
+            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
+            			</para>
+            			<para>
+            			The date format specifier admits the same syntax as the
+            			time pattern string of the <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+            			<para>
+            			For better results it is recommended to use the log4net date
+            			formatters. These can be specified using one of the strings
+            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
+            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
+            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
+            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
+            			<b>%utcdate{ISO8601}</b> or <b>%utcdate{ABSOLUTE}</b>.
+            			</para>
+            			<para>
+            			These dedicated date formatters perform significantly
+            			better than <see cref="M:DateTime.ToString(string)"/>.
+            			</para>
+                    </description>
+                </item>
+            	<item>
+            		<term>%</term>
+            		<description>
+            			<para>
+            			The sequence %% outputs a single percent sign.
+            			</para>
+            		</description>
+            	</item>
+            </list>
+            <para>
+            Additional pattern converters may be registered with a specific <see cref="T:log4net.Util.PatternString"/>
+            instance using <see cref="M:AddConverter(ConverterInfo)"/> or
+            <see cref="M:AddConverter(string, Type)"/>.
+            </para>
+            <para>
+            See the <see cref="T:log4net.Layout.PatternLayout"/> for details on the 
+            <i>format modifiers</i> supported by the patterns.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.PatternString.s_globalRulesRegistry">
+            <summary>
+            Internal map of converter identifiers to converter types.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternString.m_pattern">
+            <summary>
+            the pattern
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternString.m_head">
+            <summary>
+            the head of the pattern converter chain
+            </summary>
+        </member>
+        <member name="F:log4net.Util.PatternString.m_instanceRulesRegistry">
+            <summary>
+            patterns defined on this PatternString only
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PatternString.#cctor">
+            <summary>
+            Initialize the global registry
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PatternString.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Initialize a new instance of <see cref="T:log4net.Util.PatternString"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.#ctor(System.String)">
+            <summary>
+            Constructs a PatternString
+            </summary>
+            <param name="pattern">The pattern to use with this PatternString</param>
+            <remarks>
+            <para>
+            Initialize a new instance of <see cref="T:log4net.Util.PatternString"/> with the pattern specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.ActivateOptions">
+            <summary>
+            Initialize object options
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Util.PatternString.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Util.PatternString.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Util.PatternString.ActivateOptions"/> must be called again.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.CreatePatternParser(System.String)">
+            <summary>
+            Create the <see cref="T:log4net.Util.PatternParser"/> used to parse the pattern
+            </summary>
+            <param name="pattern">the pattern to parse</param>
+            <returns>The <see cref="T:log4net.Util.PatternParser"/></returns>
+            <remarks>
+            <para>
+            Returns PatternParser used to parse the conversion string. Subclasses
+            may override this to return a subclass of PatternParser which recognize
+            custom conversion pattern name.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.Format(System.IO.TextWriter)">
+            <summary>
+            Produces a formatted string as specified by the conversion pattern.
+            </summary>
+            <param name="writer">The TextWriter to write the formatted event to</param>
+            <remarks>
+            <para>
+            Format the pattern to the <paramref name="writer"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.Format">
+            <summary>
+            Format the pattern as a string
+            </summary>
+            <returns>the pattern formatted as a string</returns>
+            <remarks>
+            <para>
+            Format the pattern to a string.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.AddConverter(log4net.Util.ConverterInfo)">
+            <summary>
+            Add a converter to this PatternString
+            </summary>
+            <param name="converterInfo">the converter info</param>
+            <remarks>
+            <para>
+            This version of the method is used by the configurator.
+            Programmatic users should use the alternative <see cref="M:AddConverter(string,Type)"/> method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PatternString.AddConverter(System.String,System.Type)">
+            <summary>
+            Add a converter to this PatternString
+            </summary>
+            <param name="name">the name of the conversion pattern for this converter</param>
+            <param name="type">the type of the converter</param>
+            <remarks>
+            <para>
+            Add a converter to this PatternString
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PatternString.ConversionPattern">
+            <summary>
+            Gets or sets the pattern formatting string
+            </summary>
+            <value>
+            The pattern formatting string
+            </value>
+            <remarks>
+            <para>
+            The <b>ConversionPattern</b> option. This is the string which
+            controls formatting and consists of a mix of literal content and
+            conversion specifiers.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.PropertiesDictionary">
+            <summary>
+            String keyed object map.
+            </summary>
+            <remarks>
+            <para>
+            While this collection is serializable only member 
+            objects that are serializable will
+            be serialized along with this collection.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="T:log4net.Util.ReadOnlyPropertiesDictionary">
+            <summary>
+            String keyed object map that is read only.
+            </summary>
+            <remarks>
+            <para>
+            This collection is readonly and cannot be modified.
+            </para>
+            <para>
+            While this collection is serializable only member 
+            objects that are serializable will
+            be serialized along with this collection.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="F:log4net.Util.ReadOnlyPropertiesDictionary.m_hashtable">
+            <summary>
+            The Hashtable used to store the properties data
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor(log4net.Util.ReadOnlyPropertiesDictionary)">
+            <summary>
+            Copy Constructor
+            </summary>
+            <param name="propertiesDictionary">properties to copy</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Deserialization constructor
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class 
+            with serialized data.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.GetKeys">
+            <summary>
+            Gets the key names.
+            </summary>
+            <returns>An array of all the keys.</returns>
+            <remarks>
+            <para>
+            Gets the key names.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.Contains(System.String)">
+            <summary>
+            Test if the dictionary contains a specified key
+            </summary>
+            <param name="key">the key to look for</param>
+            <returns>true if the dictionary contains the specified key</returns>
+            <remarks>
+            <para>
+            Test if the dictionary contains a specified key
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate with data.</param>
+            <param name="context">The destination for this serialization.</param>
+            <remarks>
+            <para>
+            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#GetEnumerator">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.GetEnumerator"/>
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Remove(System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Remove(System.Object)"/>
+            </summary>
+            <param name="key"></param>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Contains(System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Contains(System.Object)"/>
+            </summary>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.Clear">
+            <summary>
+            Remove all properties from the properties collection
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Add(System.Object,System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Add(System.Object,System.Object)"/>
+            </summary>
+            <param name="key"></param>
+            <param name="value"></param>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#CopyTo(System.Array,System.Int32)">
+            <summary>
+            See <see cref="M:System.Collections.ICollection.CopyTo(System.Array,System.Int32)"/>
+            </summary>
+            <param name="array"></param>
+            <param name="index"></param>
+        </member>
+        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            See <see cref="M:System.Collections.IEnumerable.GetEnumerator"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.Item(System.String)">
+            <summary>
+            Gets or sets the value of the  property with the specified key.
+            </summary>
+            <value>
+            The value of the property with the specified key.
+            </value>
+            <param name="key">The key of the property to get or set.</param>
+            <remarks>
+            <para>
+            The property value will only be serialized if it is serializable.
+            If it cannot be serialized it will be silently ignored if
+            a serialization operation is performed.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.InnerHashtable">
+            <summary>
+            The hashtable used to store the properties
+            </summary>
+            <value>
+            The internal collection used to store the properties
+            </value>
+            <remarks>
+            <para>
+            The hashtable used to store the properties
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#IsReadOnly">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.IsReadOnly"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Item(System.Object)">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Item(System.Object)"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Values">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Values"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Keys">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Keys"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#IsFixedSize">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.IsFixedSize"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#IsSynchronized">
+            <summary>
+            See <see cref="P:System.Collections.ICollection.IsSynchronized"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.Count">
+            <summary>
+            The number of properties in this collection
+            </summary>
+        </member>
+        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#SyncRoot">
+            <summary>
+            See <see cref="P:System.Collections.ICollection.SyncRoot"/>
+            </summary>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.#ctor(log4net.Util.ReadOnlyPropertiesDictionary)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="propertiesDictionary">properties to copy</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class 
+            with serialized data.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <remarks>
+            <para>
+            Because this class is sealed the serialization constructor is private.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.Remove(System.String)">
+            <summary>
+            Remove the entry with the specified key from this dictionary
+            </summary>
+            <param name="key">the key for the entry to remove</param>
+            <remarks>
+            <para>
+            Remove the entry with the specified key from this dictionary
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#GetEnumerator">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.GetEnumerator"/>
+            </summary>
+            <returns>an enumerator</returns>
+            <remarks>
+            <para>
+            Returns a <see cref="T:System.Collections.IDictionaryEnumerator"/> over the contest of this collection.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Remove(System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Remove(System.Object)"/>
+            </summary>
+            <param name="key">the key to remove</param>
+            <remarks>
+            <para>
+            Remove the entry with the specified key from this dictionary
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Contains(System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Contains(System.Object)"/>
+            </summary>
+            <param name="key">the key to lookup in the collection</param>
+            <returns><c>true</c> if the collection contains the specified key</returns>
+            <remarks>
+            <para>
+            Test if this collection contains a specified key.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.Clear">
+            <summary>
+            Remove all properties from the properties collection
+            </summary>
+            <remarks>
+            <para>
+            Remove all properties from the properties collection
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Add(System.Object,System.Object)">
+            <summary>
+            See <see cref="M:System.Collections.IDictionary.Add(System.Object,System.Object)"/>
+            </summary>
+            <param name="key">the key</param>
+            <param name="value">the value to store for the key</param>
+            <remarks>
+            <para>
+            Store a value for the specified <see cref="T:System.String"/> <paramref name="key"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentException">Thrown if the <paramref name="key"/> is not a string</exception>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#ICollection#CopyTo(System.Array,System.Int32)">
+            <summary>
+            See <see cref="M:System.Collections.ICollection.CopyTo(System.Array,System.Int32)"/>
+            </summary>
+            <param name="array"></param>
+            <param name="index"></param>
+        </member>
+        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            See <see cref="M:System.Collections.IEnumerable.GetEnumerator"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.Item(System.String)">
+            <summary>
+            Gets or sets the value of the  property with the specified key.
+            </summary>
+            <value>
+            The value of the property with the specified key.
+            </value>
+            <param name="key">The key of the property to get or set.</param>
+            <remarks>
+            <para>
+            The property value will only be serialized if it is serializable.
+            If it cannot be serialized it will be silently ignored if
+            a serialization operation is performed.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#IsReadOnly">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.IsReadOnly"/>
+            </summary>
+            <value>
+            <c>false</c>
+            </value>
+            <remarks>
+            <para>
+            This collection is modifiable. This property always
+            returns <c>false</c>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Item(System.Object)">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Item(System.Object)"/>
+            </summary>
+            <value>
+            The value for the key specified.
+            </value>
+            <remarks>
+            <para>
+            Get or set a value for the specified <see cref="T:System.String"/> <paramref name="key"/>.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentException">Thrown if the <paramref name="key"/> is not a string</exception>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Values">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Values"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Keys">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.Keys"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#IsFixedSize">
+            <summary>
+            See <see cref="P:System.Collections.IDictionary.IsFixedSize"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#ICollection#IsSynchronized">
+            <summary>
+            See <see cref="P:System.Collections.ICollection.IsSynchronized"/>
+            </summary>
+        </member>
+        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#ICollection#SyncRoot">
+            <summary>
+            See <see cref="P:System.Collections.ICollection.SyncRoot"/>
+            </summary>
+        </member>
+        <member name="T:log4net.Util.PropertyEntry">
+            <summary>
+            A class to hold the key and data for a property set in the config file
+            </summary>
+            <remarks>
+            <para>
+            A class to hold the key and data for a property set in the config file
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.PropertyEntry.ToString">
+            <summary>
+            Override <c>Object.ToString</c> to return sensible debug info
+            </summary>
+            <returns>string info about this object</returns>
+        </member>
+        <member name="P:log4net.Util.PropertyEntry.Key">
+            <summary>
+            Property Key
+            </summary>
+            <value>
+            Property Key
+            </value>
+            <remarks>
+            <para>
+            Property Key.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.PropertyEntry.Value">
+            <summary>
+            Property Value
+            </summary>
+            <value>
+            Property Value
+            </value>
+            <remarks>
+            <para>
+            Property Value.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ProtectCloseTextWriter">
+            <summary>
+            A <see cref="T:System.IO.TextWriter"/> that ignores the <see cref="M:log4net.Util.ProtectCloseTextWriter.Close"/> message
+            </summary>
+            <remarks>
+            <para>
+            This writer is used in special cases where it is necessary 
+            to protect a writer from being closed by a client.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.ProtectCloseTextWriter.#ctor(System.IO.TextWriter)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="writer">the writer to actually write to</param>
+            <remarks>
+            <para>
+            Create a new ProtectCloseTextWriter using a writer
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ProtectCloseTextWriter.Attach(System.IO.TextWriter)">
+            <summary>
+            Attach this instance to a different underlying <see cref="T:System.IO.TextWriter"/>
+            </summary>
+            <param name="writer">the writer to attach to</param>
+            <remarks>
+            <para>
+            Attach this instance to a different underlying <see cref="T:System.IO.TextWriter"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ProtectCloseTextWriter.Close">
+            <summary>
+            Does not close the underlying output writer.
+            </summary>
+            <remarks>
+            <para>
+            Does not close the underlying output writer.
+            This method does nothing.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ReaderWriterLock">
+            <summary>
+            Defines a lock that supports single writers and multiple readers
+            </summary>
+            <remarks>
+            <para>
+            <c>ReaderWriterLock</c> is used to synchronize access to a resource. 
+            At any given time, it allows either concurrent read access for 
+            multiple threads, or write access for a single thread. In a 
+            situation where a resource is changed infrequently, a 
+            <c>ReaderWriterLock</c> provides better throughput than a simple 
+            one-at-a-time lock, such as <see cref="T:System.Threading.Monitor"/>.
+            </para>
+            <para>
+            If a platform does not support a <c>System.Threading.ReaderWriterLock</c> 
+            implementation then all readers and writers are serialized. Therefore 
+            the caller must not rely on multiple simultaneous readers.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.ReaderWriterLock.#ctor">
+            <summary>
+            Constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ReaderWriterLock"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReaderWriterLock.AcquireReaderLock">
+            <summary>
+            Acquires a reader lock
+            </summary>
+            <remarks>
+            <para>
+            <see cref="M:log4net.Util.ReaderWriterLock.AcquireReaderLock"/> blocks if a different thread has the writer 
+            lock, or if at least one thread is waiting for the writer lock.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReaderWriterLock.ReleaseReaderLock">
+            <summary>
+            Decrements the lock count
+            </summary>
+            <remarks>
+            <para>
+            <see cref="M:log4net.Util.ReaderWriterLock.ReleaseReaderLock"/> decrements the lock count. When the count 
+            reaches zero, the lock is released.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReaderWriterLock.AcquireWriterLock">
+            <summary>
+            Acquires the writer lock
+            </summary>
+            <remarks>
+            <para>
+            This method blocks if another thread has a reader lock or writer lock.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReaderWriterLock.ReleaseWriterLock">
+            <summary>
+            Decrements the lock count on the writer lock
+            </summary>
+            <remarks>
+            <para>
+            ReleaseWriterLock decrements the writer lock count. 
+            When the count reaches zero, the writer lock is released.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ReusableStringWriter">
+            <summary>
+            A <see cref="T:System.IO.StringWriter"/> that can be <see cref="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)"/> and reused
+            </summary>
+            <remarks>
+            <para>
+            A <see cref="T:System.IO.StringWriter"/> that can be <see cref="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)"/> and reused.
+            This uses a single buffer for string operations.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.ReusableStringWriter.#ctor(System.IFormatProvider)">
+            <summary>
+            Create an instance of <see cref="T:log4net.Util.ReusableStringWriter"/>
+            </summary>
+            <param name="formatProvider">the format provider to use</param>
+            <remarks>
+            <para>
+            Create an instance of <see cref="T:log4net.Util.ReusableStringWriter"/>
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReusableStringWriter.Dispose(System.Boolean)">
+            <summary>
+            Override Dispose to prevent closing of writer
+            </summary>
+            <param name="disposing">flag</param>
+            <remarks>
+            <para>
+            Override Dispose to prevent closing of writer
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)">
+            <summary>
+            Reset this string writer so that it can be reused.
+            </summary>
+            <param name="maxCapacity">the maximum buffer capacity before it is trimmed</param>
+            <param name="defaultSize">the default size to make the buffer</param>
+            <remarks>
+            <para>
+            Reset this string writer so that it can be reused.
+            The internal buffers are cleared and reset.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.SystemInfo">
+            <summary>
+            Utility class for system specific information.
+            </summary>
+            <remarks>
+            <para>
+            Utility class of static methods for system specific information.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+            <author>Alexey Solofnenko</author>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.#ctor">
+            <summary>
+            Private constructor to prevent instances.
+            </summary>
+            <remarks>
+            <para>
+            Only static methods are exposed from this type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.#cctor">
+            <summary>
+            Initialize default values for private static fields.
+            </summary>
+            <remarks>
+            <para>
+            Only static methods are exposed from this type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.AssemblyLocationInfo(System.Reflection.Assembly)">
+            <summary>
+            Gets the assembly location path for the specified assembly.
+            </summary>
+            <param name="myAssembly">The assembly to get the location for.</param>
+            <returns>The location of the assembly.</returns>
+            <remarks>
+            <para>
+            This method does not guarantee to return the correct path
+            to the assembly. If only tries to give an indication as to
+            where the assembly was loaded from.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.AssemblyQualifiedName(System.Type)">
+            <summary>
+            Gets the fully qualified name of the <see cref="T:System.Type"/>, including 
+            the name of the assembly from which the <see cref="T:System.Type"/> was 
+            loaded.
+            </summary>
+            <param name="type">The <see cref="T:System.Type"/> to get the fully qualified name for.</param>
+            <returns>The fully qualified name for the <see cref="T:System.Type"/>.</returns>
+            <remarks>
+            <para>
+            This is equivalent to the <c>Type.AssemblyQualifiedName</c> property,
+            but this method works on the .NET Compact Framework 1.0 as well as
+            the full .NET runtime.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.AssemblyShortName(System.Reflection.Assembly)">
+            <summary>
+            Gets the short name of the <see cref="T:System.Reflection.Assembly"/>.
+            </summary>
+            <param name="myAssembly">The <see cref="T:System.Reflection.Assembly"/> to get the name for.</param>
+            <returns>The short name of the <see cref="T:System.Reflection.Assembly"/>.</returns>
+            <remarks>
+            <para>
+            The short name of the assembly is the <see cref="P:System.Reflection.Assembly.FullName"/> 
+            without the version, culture, or public key. i.e. it is just the 
+            assembly's file name without the extension.
+            </para>
+            <para>
+            Use this rather than <c>Assembly.GetName().Name</c> because that
+            is not available on the Compact Framework.
+            </para>
+            <para>
+            Because of a FileIOPermission security demand we cannot do
+            the obvious Assembly.GetName().Name. We are allowed to get
+            the <see cref="P:System.Reflection.Assembly.FullName"/> of the assembly so we 
+            start from there and strip out just the assembly name.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.AssemblyFileName(System.Reflection.Assembly)">
+            <summary>
+            Gets the file name portion of the <see cref="T:System.Reflection.Assembly"/>, including the extension.
+            </summary>
+            <param name="myAssembly">The <see cref="T:System.Reflection.Assembly"/> to get the file name for.</param>
+            <returns>The file name of the assembly.</returns>
+            <remarks>
+            <para>
+            Gets the file name portion of the <see cref="T:System.Reflection.Assembly"/>, including the extension.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.Type,System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Loads the type specified in the type string.
+            </summary>
+            <param name="relativeType">A sibling type to use to load the type.</param>
+            <param name="typeName">The name of the type to load.</param>
+            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
+            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
+            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>
+            <remarks>
+            <para>
+            If the type name is fully qualified, i.e. if contains an assembly name in 
+            the type name, the type will be loaded from the system using 
+            <see cref="M:Type.GetType(string,bool)"/>.
+            </para>
+            <para>
+            If the type name is not fully qualified, it will be loaded from the assembly
+            containing the specified relative type. If the type is not found in the assembly 
+            then all the loaded assemblies will be searched for the type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Loads the type specified in the type string.
+            </summary>
+            <param name="typeName">The name of the type to load.</param>
+            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
+            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
+            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>		
+            <remarks>
+            <para>
+            If the type name is fully qualified, i.e. if contains an assembly name in 
+            the type name, the type will be loaded from the system using 
+            <see cref="M:Type.GetType(string,bool)"/>.
+            </para>
+            <para>
+            If the type name is not fully qualified it will be loaded from the
+            assembly that is directly calling this method. If the type is not found 
+            in the assembly then all the loaded assemblies will be searched for the type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.Reflection.Assembly,System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Loads the type specified in the type string.
+            </summary>
+            <param name="relativeAssembly">An assembly to load the type from.</param>
+            <param name="typeName">The name of the type to load.</param>
+            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
+            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
+            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>
+            <remarks>
+            <para>
+            If the type name is fully qualified, i.e. if contains an assembly name in 
+            the type name, the type will be loaded from the system using 
+            <see cref="M:Type.GetType(string,bool)"/>.
+            </para>
+            <para>
+            If the type name is not fully qualified it will be loaded from the specified
+            assembly. If the type is not found in the assembly then all the loaded assemblies 
+            will be searched for the type.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.NewGuid">
+            <summary>
+            Generate a new guid
+            </summary>
+            <returns>A new Guid</returns>
+            <remarks>
+            <para>
+            Generate a new guid
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.CreateArgumentOutOfRangeException(System.String,System.Object,System.String)">
+            <summary>
+            Create an <see cref="T:System.ArgumentOutOfRangeException"/>
+            </summary>
+            <param name="parameterName">The name of the parameter that caused the exception</param>
+            <param name="actualValue">The value of the argument that causes this exception</param>
+            <param name="message">The message that describes the error</param>
+            <returns>the ArgumentOutOfRangeException object</returns>
+            <remarks>
+            <para>
+            Create a new instance of the <see cref="T:System.ArgumentOutOfRangeException"/> class 
+            with a specified error message, the parameter name, and the value 
+            of the argument.
+            </para>
+            <para>
+            The Compact Framework does not support the 3 parameter constructor for the
+            <see cref="T:System.ArgumentOutOfRangeException"/> type. This method provides an
+            implementation that works for all platforms.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.TryParse(System.String,System.Int32@)">
+            <summary>
+            Parse a string into an <see cref="T:System.Int32"/> value
+            </summary>
+            <param name="s">the string to parse</param>
+            <param name="val">out param where the parsed value is placed</param>
+            <returns><c>true</c> if the string was able to be parsed into an integer</returns>
+            <remarks>
+            <para>
+            Attempts to parse the string into an integer. If the string cannot
+            be parsed then this method returns <c>false</c>. The method does not throw an exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.TryParse(System.String,System.Int64@)">
+            <summary>
+            Parse a string into an <see cref="T:System.Int64"/> value
+            </summary>
+            <param name="s">the string to parse</param>
+            <param name="val">out param where the parsed value is placed</param>
+            <returns><c>true</c> if the string was able to be parsed into an integer</returns>
+            <remarks>
+            <para>
+            Attempts to parse the string into an integer. If the string cannot
+            be parsed then this method returns <c>false</c>. The method does not throw an exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.TryParse(System.String,System.Int16@)">
+            <summary>
+            Parse a string into an <see cref="T:System.Int16"/> value
+            </summary>
+            <param name="s">the string to parse</param>
+            <param name="val">out param where the parsed value is placed</param>
+            <returns><c>true</c> if the string was able to be parsed into an integer</returns>
+            <remarks>
+            <para>
+            Attempts to parse the string into an integer. If the string cannot
+            be parsed then this method returns <c>false</c>. The method does not throw an exception.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.GetAppSetting(System.String)">
+            <summary>
+            Lookup an application setting
+            </summary>
+            <param name="key">the application settings key to lookup</param>
+            <returns>the value for the key, or <c>null</c></returns>
+            <remarks>
+            <para>
+            Configuration APIs are not supported under the Compact Framework
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.ConvertToFullPath(System.String)">
+            <summary>
+            Convert a path into a fully qualified local file path.
+            </summary>
+            <param name="path">The path to convert.</param>
+            <returns>The fully qualified path.</returns>
+            <remarks>
+            <para>
+            Converts the path specified to a fully
+            qualified path. If the path is relative it is
+            taken as relative from the application base 
+            directory.
+            </para>
+            <para>
+            The path specified must be a local file path, a URI is not supported.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.CreateCaseInsensitiveHashtable">
+            <summary>
+            Creates a new case-insensitive instance of the <see cref="T:System.Collections.Hashtable"/> class with the default initial capacity. 
+            </summary>
+            <returns>A new case-insensitive instance of the <see cref="T:System.Collections.Hashtable"/> class with the default initial capacity</returns>
+            <remarks>
+            <para>
+            The new Hashtable instance uses the default load factor, the CaseInsensitiveHashCodeProvider, and the CaseInsensitiveComparer.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemInfo.EqualsIgnoringCase(System.String,System.String)">
+            <summary>
+            Tests two strings for equality, the ignoring case.
+            </summary>
+            <remarks>
+            If the platform permits, culture information is ignored completely (ordinal comparison).
+            The aim of this method is to provide a fast comparison that deals with <c>null</c> and ignores different casing.
+            It is not supposed to deal with various, culture-specific habits.
+            Use it to compare against pure ASCII constants, like keywords etc.
+            </remarks>
+            <param name="a">The one string.</param>
+            <param name="b">The other string.</param>
+            <returns><c>true</c> if the strings are equal, <c>false</c> otherwise.</returns>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.EmptyTypes">
+            <summary>
+            Gets an empty array of types.
+            </summary>
+            <remarks>
+            <para>
+            The <c>Type.EmptyTypes</c> field is not available on
+            the .NET Compact Framework 1.0.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.declaringType">
+            <summary>
+            The fully qualified type of the SystemInfo class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.s_hostName">
+            <summary>
+            Cache the host name for the current machine
+            </summary>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.s_appFriendlyName">
+            <summary>
+            Cache the application friendly name
+            </summary>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.s_nullText">
+            <summary>
+            Text to output when a <c>null</c> is encountered.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.s_notAvailableText">
+            <summary>
+            Text to output when an unsupported feature is requested.
+            </summary>
+        </member>
+        <member name="F:log4net.Util.SystemInfo.s_processStartTimeUtc">
+            <summary>
+            Start time for the current process.
+            </summary>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.NewLine">
+            <summary>
+            Gets the system dependent line terminator.
+            </summary>
+            <value>
+            The system dependent line terminator.
+            </value>
+            <remarks>
+            <para>
+            Gets the system dependent line terminator.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.ApplicationBaseDirectory">
+            <summary>
+            Gets the base directory for this <see cref="T:System.AppDomain"/>.
+            </summary>
+            <value>The base directory path for the current <see cref="T:System.AppDomain"/>.</value>
+            <remarks>
+            <para>
+            Gets the base directory for this <see cref="T:System.AppDomain"/>.
+            </para>
+            <para>
+            The value returned may be either a local file path or a URI.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.ConfigurationFileLocation">
+            <summary>
+            Gets the path to the configuration file for the current <see cref="T:System.AppDomain"/>.
+            </summary>
+            <value>The path to the configuration file for the current <see cref="T:System.AppDomain"/>.</value>
+            <remarks>
+            <para>
+            The .NET Compact Framework 1.0 does not have a concept of a configuration
+            file. For this runtime, we use the entry assembly location as the root for
+            the configuration file name.
+            </para>
+            <para>
+            The value returned may be either a local file path or a URI.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.EntryAssemblyLocation">
+            <summary>
+            Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
+            </summary>
+            <value>The path to the entry assembly.</value>
+            <remarks>
+            <para>
+            Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.CurrentThreadId">
+            <summary>
+            Gets the ID of the current thread.
+            </summary>
+            <value>The ID of the current thread.</value>
+            <remarks>
+            <para>
+            On the .NET framework, the <c>AppDomain.GetCurrentThreadId</c> method
+            is used to obtain the thread ID for the current thread. This is the 
+            operating system ID for the thread.
+            </para>
+            <para>
+            On the .NET Compact Framework 1.0 it is not possible to get the 
+            operating system thread ID for the current thread. The native method 
+            <c>GetCurrentThreadId</c> is implemented inline in a header file
+            and cannot be called.
+            </para>
+            <para>
+            On the .NET Framework 2.0 the <c>Thread.ManagedThreadId</c> is used as this
+            gives a stable id unrelated to the operating system thread ID which may 
+            change if the runtime is using fibers.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.HostName">
+            <summary>
+            Get the host name or machine name for the current machine
+            </summary>
+            <value>
+            The hostname or machine name
+            </value>
+            <remarks>
+            <para>
+            Get the host name or machine name for the current machine
+            </para>
+            <para>
+            The host name (<see cref="M:System.Net.Dns.GetHostName"/>) or
+            the machine name (<c>Environment.MachineName</c>) for
+            the current machine, or if neither of these are available
+            then <c>NOT AVAILABLE</c> is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.ApplicationFriendlyName">
+            <summary>
+            Get this application's friendly name
+            </summary>
+            <value>
+            The friendly name of this application as a string
+            </value>
+            <remarks>
+            <para>
+            If available the name of the application is retrieved from
+            the <c>AppDomain</c> using <c>AppDomain.CurrentDomain.FriendlyName</c>.
+            </para>
+            <para>
+            Otherwise the file name of the entry assembly is used.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.ProcessStartTime">
+            <summary>
+            Get the start time for the current process.
+            </summary>
+            <remarks>
+            <para>
+            This is the time at which the log4net library was loaded into the
+            AppDomain. Due to reports of a hang in the call to <c>System.Diagnostics.Process.StartTime</c>
+            this is not the start time for the current process.
+            </para>
+            <para>
+            The log4net library should be loaded by an application early during its
+            startup, therefore this start time should be a good approximation for
+            the actual start time.
+            </para>
+            <para>
+            Note that AppDomains may be loaded and unloaded within the
+            same process without the process terminating, however this start time
+            will be set per AppDomain.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.ProcessStartTimeUtc">
+            <summary>
+            Get the UTC start time for the current process.
+            </summary>
+            <remarks>
+            <para>
+            This is the UTC time at which the log4net library was loaded into the
+            AppDomain. Due to reports of a hang in the call to <c>System.Diagnostics.Process.StartTime</c>
+            this is not the start time for the current process.
+            </para>
+            <para>
+            The log4net library should be loaded by an application early during its
+            startup, therefore this start time should be a good approximation for
+            the actual start time.
+            </para>
+            <para>
+            Note that AppDomains may be loaded and unloaded within the
+            same process without the process terminating, however this start time
+            will be set per AppDomain.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.NullText">
+            <summary>
+            Text to output when a <c>null</c> is encountered.
+            </summary>
+            <remarks>
+            <para>
+            Use this value to indicate a <c>null</c> has been encountered while
+            outputting a string representation of an item.
+            </para>
+            <para>
+            The default value is <c>(null)</c>. This value can be overridden by specifying
+            a value for the <c>log4net.NullText</c> appSetting in the application's
+            .config file.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.SystemInfo.NotAvailableText">
+            <summary>
+            Text to output when an unsupported feature is requested.
+            </summary>
+            <remarks>
+            <para>
+            Use this value when an unsupported feature is requested.
+            </para>
+            <para>
+            The default value is <c>NOT AVAILABLE</c>. This value can be overridden by specifying
+            a value for the <c>log4net.NotAvailableText</c> appSetting in the application's
+            .config file.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.SystemStringFormat">
+            <summary>
+            Utility class that represents a format string.
+            </summary>
+            <remarks>
+            <para>
+            Utility class that represents a format string.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.#ctor(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Initialise the <see cref="T:log4net.Util.SystemStringFormat"/>
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information.</param>
+            <param name="format">A <see cref="T:System.String"/> containing zero or more format items.</param>
+            <param name="args">An <see cref="T:System.Object"/> array containing zero or more objects to format.</param>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.ToString">
+            <summary>
+            Format the string and arguments
+            </summary>
+            <returns>the formatted string</returns>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.StringFormat(System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Replaces the format item in a specified <see cref="T:System.String"/> with the text equivalent 
+            of the value of a corresponding <see cref="T:System.Object"/> instance in a specified array.
+            A specified parameter supplies culture-specific formatting information.
+            </summary>
+            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information.</param>
+            <param name="format">A <see cref="T:System.String"/> containing zero or more format items.</param>
+            <param name="args">An <see cref="T:System.Object"/> array containing zero or more objects to format.</param>
+            <returns>
+            A copy of format in which the format items have been replaced by the <see cref="T:System.String"/> 
+            equivalent of the corresponding instances of <see cref="T:System.Object"/> in args.
+            </returns>
+            <remarks>
+            <para>
+            This method does not throw exceptions. If an exception thrown while formatting the result the
+            exception and arguments are returned in the result string.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.StringFormatError(System.Exception,System.String,System.Object[])">
+            <summary>
+            Process an error during StringFormat
+            </summary>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.RenderArray(System.Array,System.Text.StringBuilder)">
+            <summary>
+            Dump the contents of an array into a string builder
+            </summary>
+        </member>
+        <member name="M:log4net.Util.SystemStringFormat.RenderObject(System.Object,System.Text.StringBuilder)">
+            <summary>
+            Dump an object to a string
+            </summary>
+        </member>
+        <member name="F:log4net.Util.SystemStringFormat.declaringType">
+            <summary>
+            The fully qualified type of the SystemStringFormat class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ThreadContextProperties">
+            <summary>
+            Implementation of Properties collection for the <see cref="T:log4net.ThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Class implements a collection of properties that is specific to each thread.
+            The class is not synchronized as each thread has its own <see cref="T:log4net.Util.PropertiesDictionary"/>.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.ThreadContextProperties._dictionary">
+            <summary>
+            Each thread will automatically have its instance.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ThreadContextProperties.#ctor">
+            <summary>
+            Internal constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextProperties"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextProperties.Remove(System.String)">
+            <summary>
+            Remove a property
+            </summary>
+            <param name="key">the key for the entry to remove</param>
+            <remarks>
+            <para>
+            Remove a property
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextProperties.GetKeys">
+            <summary>
+            Get the keys stored in the properties.
+            </summary>
+            <para>
+            Gets the keys stored in the properties.
+            </para>
+            <returns>a set of the defined keys</returns>
+        </member>
+        <member name="M:log4net.Util.ThreadContextProperties.Clear">
+            <summary>
+            Clear all properties
+            </summary>
+            <remarks>
+            <para>
+            Clear all properties
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextProperties.GetProperties(System.Boolean)">
+            <summary>
+            Get the <c>PropertiesDictionary</c> for this thread.
+            </summary>
+            <param name="create">create the dictionary if it does not exist, otherwise return null if does not exist</param>
+            <returns>the properties for this thread</returns>
+            <remarks>
+            <para>
+            The collection returned is only to be used on the calling thread. If the
+            caller needs to share the collection between different threads then the 
+            caller must clone the collection before doing so.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextProperties.Item(System.String)">
+            <summary>
+            Gets or sets the value of a property
+            </summary>
+            <value>
+            The value for the property with the specified key
+            </value>
+            <remarks>
+            <para>
+            Gets or sets the value of a property
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ThreadContextStack">
+            <summary>
+            Implementation of Stack for the <see cref="T:log4net.ThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Implementation of Stack for the <see cref="T:log4net.ThreadContext"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="F:log4net.Util.ThreadContextStack.m_stack">
+            <summary>
+            The stack store.
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.#ctor">
+            <summary>
+            Internal constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack"/> class. 
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.Clear">
+            <summary>
+            Clears all the contextual information held in this stack.
+            </summary>
+            <remarks>
+            <para>
+            Clears all the contextual information held in this stack.
+            Only call this if you think that this tread is being reused after
+            a previous call execution which may not have completed correctly.
+            You do not need to use this method if you always guarantee to call
+            the <see cref="M:System.IDisposable.Dispose"/> method of the <see cref="T:System.IDisposable"/>
+            returned from <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> even in exceptional circumstances,
+            for example by using the <c>using(log4net.ThreadContext.Stacks["NDC"].Push("Stack_Message"))</c> 
+            syntax.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.Pop">
+            <summary>
+            Removes the top context from this stack.
+            </summary>
+            <returns>The message in the context that was removed from the top of this stack.</returns>
+            <remarks>
+            <para>
+            Remove the top context from this stack, and return
+            it to the caller. If this stack is empty then an
+            empty string (not <see langword="null"/>) is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.Push(System.String)">
+            <summary>
+            Pushes a new context message into this stack.
+            </summary>
+            <param name="message">The new context message.</param>
+            <returns>
+            An <see cref="T:System.IDisposable"/> that can be used to clean up the context stack.
+            </returns>
+            <remarks>
+            <para>
+            Pushes a new context onto this stack. An <see cref="T:System.IDisposable"/>
+            is returned that can be used to clean up this stack. This
+            can be easily combined with the <c>using</c> keyword to scope the
+            context.
+            </para>
+            </remarks>
+            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
+            <code lang="C#">
+            using(log4net.ThreadContext.Stacks["NDC"].Push("Stack_Message"))
+            {
+            	log.Warn("This should have an ThreadContext Stack message");
+            }
+            </code>
+            </example>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.GetFullMessage">
+            <summary>
+            Gets the current context information for this stack.
+            </summary>
+            <returns>The current context information.</returns>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.ToString">
+            <summary>
+            Gets the current context information for this stack.
+            </summary>
+            <returns>Gets the current context information</returns>
+            <remarks>
+            <para>
+            Gets the current context information for this stack.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.log4net#Core#IFixingRequired#GetFixedObject">
+            <summary>
+            Get a portable version of this object
+            </summary>
+            <returns>the portable instance of this object</returns>
+            <remarks>
+            <para>
+            Get a cross thread portable version of this object
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextStack.Count">
+            <summary>
+            The number of messages in the stack
+            </summary>
+            <value>
+            The current number of messages in the stack
+            </value>
+            <remarks>
+            <para>
+            The current number of messages in the stack. That is
+            the number of times <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> has been called
+            minus the number of times <see cref="M:log4net.Util.ThreadContextStack.Pop"/> has been called.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextStack.InternalStack">
+            <summary>
+            Gets and sets the internal stack used by this <see cref="T:log4net.Util.ThreadContextStack"/>
+            </summary>
+            <value>The internal storage stack</value>
+            <remarks>
+            <para>
+            This property is provided only to support backward compatability 
+            of the <see cref="T:log4net.NDC"/>. Tytpically the internal stack should not
+            be modified.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ThreadContextStack.StackFrame">
+            <summary>
+            Inner class used to represent a single context frame in the stack.
+            </summary>
+            <remarks>
+            <para>
+            Inner class used to represent a single context frame in the stack.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.StackFrame.#ctor(System.String,log4net.Util.ThreadContextStack.StackFrame)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="message">The message for this context.</param>
+            <param name="parent">The parent context in the chain.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack.StackFrame"/> class
+            with the specified message and parent context.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextStack.StackFrame.Message">
+            <summary>
+            Get the message.
+            </summary>
+            <value>The message.</value>
+            <remarks>
+            <para>
+            Get the message.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextStack.StackFrame.FullMessage">
+            <summary>
+            Gets the full text of the context down to the root level.
+            </summary>
+            <value>
+            The full text of the context down to the root level.
+            </value>
+            <remarks>
+            <para>
+            Gets the full text of the context down to the root level.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ThreadContextStack.AutoPopStackFrame">
+            <summary>
+            Struct returned from the <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> method.
+            </summary>
+            <remarks>
+            <para>
+            This struct implements the <see cref="T:System.IDisposable"/> and is designed to be used
+            with the <see langword="using"/> pattern to remove the stack frame at the end of the scope.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.ThreadContextStack.AutoPopStackFrame.m_frameStack">
+            <summary>
+            The ThreadContextStack internal stack
+            </summary>
+        </member>
+        <member name="F:log4net.Util.ThreadContextStack.AutoPopStackFrame.m_frameDepth">
+            <summary>
+            The depth to trim the stack to when this instance is disposed
+            </summary>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.AutoPopStackFrame.#ctor(System.Collections.Stack,System.Int32)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="frameStack">The internal stack used by the ThreadContextStack.</param>
+            <param name="frameDepth">The depth to return the stack to when this object is disposed.</param>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack.AutoPopStackFrame"/> class with
+            the specified stack and return depth.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStack.AutoPopStackFrame.Dispose">
+            <summary>
+            Returns the stack to the correct depth.
+            </summary>
+            <remarks>
+            <para>
+            Returns the stack to the correct depth.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.ThreadContextStacks">
+            <summary>
+            Implementation of Stacks collection for the <see cref="T:log4net.ThreadContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Implementation of Stacks collection for the <see cref="T:log4net.ThreadContext"/>
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.Util.ThreadContextStacks.#ctor(log4net.Util.ContextPropertiesBase)">
+            <summary>
+            Internal constructor
+            </summary>
+            <remarks>
+            <para>
+            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStacks"/> class.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.ThreadContextStacks.declaringType">
+            <summary>
+            The fully qualified type of the ThreadContextStacks class.
+            </summary>
+            <remarks>
+            Used by the internal logger to record the Type of the
+            log message.
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.ThreadContextStacks.Item(System.String)">
+            <summary>
+            Gets the named thread context stack
+            </summary>
+            <value>
+            The named stack
+            </value>
+            <remarks>
+            <para>
+            Gets the named thread context stack
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.Transform">
+            <summary>
+            Utility class for transforming strings.
+            </summary>
+            <remarks>
+            <para>
+            Utility class for transforming strings.
+            </para>
+            </remarks>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.Util.Transform.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.Util.Transform"/> class. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to prevent instantiation of this class.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.Transform.WriteEscapedXmlString(System.Xml.XmlWriter,System.String,System.String)">
+            <summary>
+            Write a string to an <see cref="T:System.Xml.XmlWriter"/>
+            </summary>
+            <param name="writer">the writer to write to</param>
+            <param name="textData">the string to write</param>
+            <param name="invalidCharReplacement">The string to replace non XML compliant chars with</param>
+            <remarks>
+            <para>
+            The test is escaped either using XML escape entities
+            or using CDATA sections.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.Transform.MaskXmlInvalidCharacters(System.String,System.String)">
+            <summary>
+            Replace invalid XML characters in text string
+            </summary>
+            <param name="textData">the XML text input string</param>
+            <param name="mask">the string to use in place of invalid characters</param>
+            <returns>A string that does not contain invalid XML characters.</returns>
+            <remarks>
+            <para>
+            Certain Unicode code points are not allowed in the XML InfoSet, for
+            details see: <a href="http://www.w3.org/TR/REC-xml/#charsets">http://www.w3.org/TR/REC-xml/#charsets</a>.
+            </para>
+            <para>
+            This method replaces any illegal characters in the input string
+            with the mask string specified.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.Transform.CountSubstrings(System.String,System.String)">
+            <summary>
+            Count the number of times that the substring occurs in the text
+            </summary>
+            <param name="text">the text to search</param>
+            <param name="substring">the substring to find</param>
+            <returns>the number of times the substring occurs in the text</returns>
+            <remarks>
+            <para>
+            The substring is assumed to be non repeating within itself.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.Transform.INVALIDCHARS">
+            <summary>
+            Characters illegal in XML 1.0
+            </summary>
+        </member>
+        <member name="T:log4net.Util.WindowsSecurityContext">
+            <summary>
+            Impersonate a Windows Account
+            </summary>
+            <remarks>
+            <para>
+            This <see cref="T:log4net.Core.SecurityContext"/> impersonates a Windows account.
+            </para>
+            <para>
+            How the impersonation is done depends on the value of <see cref="M:log4net.Util.WindowsSecurityContext.Impersonate(System.Object)"/>.
+            This allows the context to either impersonate a set of user credentials specified 
+            using username, domain name and password or to revert to the process credentials.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.#ctor">
+            <summary>
+            Default constructor
+            </summary>
+            <remarks>
+            <para>
+            Default constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.ActivateOptions">
+            <summary>
+            Initialize the SecurityContext based on the options set.
+            </summary>
+            <remarks>
+            <para>
+            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
+            activation scheme. The <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> method must 
+            be called on this object after the configuration properties have
+            been set. Until <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> is called this
+            object is in an undefined state and must not be used. 
+            </para>
+            <para>
+            If any of the configuration properties are modified then 
+            <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> must be called again.
+            </para>
+            <para>
+            The security context will try to Logon the specified user account and
+            capture a primary token for impersonation.
+            </para>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">The required <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/>, 
+            <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> or <see cref="P:log4net.Util.WindowsSecurityContext.Password"/> properties were not specified.</exception>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.Impersonate(System.Object)">
+            <summary>
+            Impersonate the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
+            </summary>
+            <param name="state">caller provided state</param>
+            <returns>
+            An <see cref="T:System.IDisposable"/> instance that will revoke the impersonation of this SecurityContext
+            </returns>
+            <remarks>
+            <para>
+            Depending on the <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/> property either
+            impersonate a user using credentials supplied or revert 
+            to the process credentials.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.LogonUser(System.String,System.String,System.String)">
+            <summary>
+            Create a <see cref="T:System.Security.Principal.WindowsIdentity"/> given the userName, domainName and password.
+            </summary>
+            <param name="userName">the user name</param>
+            <param name="domainName">the domain name</param>
+            <param name="password">the password</param>
+            <returns>the <see cref="T:System.Security.Principal.WindowsIdentity"/> for the account specified</returns>
+            <remarks>
+            <para>
+            Uses the Windows API call LogonUser to get a principal token for the account. This
+            token is used to initialize the WindowsIdentity.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.WindowsSecurityContext.Credentials">
+            <summary>
+            Gets or sets the impersonation mode for this security context
+            </summary>
+            <value>
+            The impersonation mode for this security context
+            </value>
+            <remarks>
+            <para>
+            Impersonate either a user with user credentials or
+            revert this thread to the credentials of the process.
+            The value is one of the <see cref="T:log4net.Util.WindowsSecurityContext.ImpersonationMode"/>
+            enum.
+            </para>
+            <para>
+            The default value is <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/>
+            </para>
+            <para>
+            When the mode is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/>
+            the user's credentials are established using the
+            <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/>, <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.Password"/>
+            values.
+            </para>
+            <para>
+            When the mode is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.Process"/>
+            no other properties need to be set. If the calling thread is 
+            impersonating then it will be reverted back to the process credentials.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.WindowsSecurityContext.UserName">
+            <summary>
+            Gets or sets the Windows username for this security context
+            </summary>
+            <value>
+            The Windows username for this security context
+            </value>
+            <remarks>
+            <para>
+            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
+            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.WindowsSecurityContext.DomainName">
+            <summary>
+            Gets or sets the Windows domain name for this security context
+            </summary>
+            <value>
+            The Windows domain name for this security context
+            </value>
+            <remarks>
+            <para>
+            The default value for <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> is the local machine name
+            taken from the <see cref="P:System.Environment.MachineName"/> property.
+            </para>
+            <para>
+            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
+            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.Util.WindowsSecurityContext.Password">
+            <summary>
+            Sets the password for the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
+            </summary>
+            <value>
+            The password for the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
+            </value>
+            <remarks>
+            <para>
+            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
+            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.Util.WindowsSecurityContext.ImpersonationMode">
+            <summary>
+            The impersonation modes for the <see cref="T:log4net.Util.WindowsSecurityContext"/>
+            </summary>
+            <remarks>
+            <para>
+            See the <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/> property for
+            details.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User">
+            <summary>
+            Impersonate a user using the credentials supplied
+            </summary>
+        </member>
+        <member name="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.Process">
+            <summary>
+            Revert this the thread to the credentials of the process
+            </summary>
+        </member>
+        <member name="T:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext">
+            <summary>
+            Adds <see cref="T:System.IDisposable"/> to <see cref="T:System.Security.Principal.WindowsImpersonationContext"/>
+            </summary>
+            <remarks>
+            <para>
+            Helper class to expose the <see cref="T:System.Security.Principal.WindowsImpersonationContext"/>
+            through the <see cref="T:System.IDisposable"/> interface.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext.#ctor(System.Security.Principal.WindowsImpersonationContext)">
+            <summary>
+            Constructor
+            </summary>
+            <param name="impersonationContext">the impersonation context being wrapped</param>
+            <remarks>
+            <para>
+            Constructor
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext.Dispose">
+            <summary>
+            Revert the impersonation
+            </summary>
+            <remarks>
+            <para>
+            Revert the impersonation
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.GlobalContext">
+            <summary>
+            The log4net Global Context.
+            </summary>
+            <remarks>
+            <para>
+            The <c>GlobalContext</c> provides a location for global debugging 
+            information to be stored.
+            </para>
+            <para>
+            The global context has a properties map and these properties can 
+            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
+            supports selecting and outputing these properties.
+            </para>
+            <para>
+            By default the <c>log4net:HostName</c> property is set to the name of 
+            the current machine.
+            </para>
+            </remarks>
+            <example>
+            <code lang="C#">
+            GlobalContext.Properties["hostname"] = Environment.MachineName;
+            </code>
+            </example>
+            <threadsafety static="true" instance="true"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.GlobalContext.#ctor">
+            <summary>
+            Private Constructor. 
+            </summary>
+            <remarks>
+            Uses a private access modifier to prevent instantiation of this class.
+            </remarks>
+        </member>
+        <member name="F:log4net.GlobalContext.s_properties">
+            <summary>
+            The global context properties instance
+            </summary>
+        </member>
+        <member name="P:log4net.GlobalContext.Properties">
+            <summary>
+            The global properties map.
+            </summary>
+            <value>
+            The global properties map.
+            </value>
+            <remarks>
+            <para>
+            The global properties map.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.AssemblyInfo">
+            <summary>
+            Provides information about the environment the assembly has
+            been built for.
+            </summary>
+        </member>
+        <member name="F:log4net.AssemblyInfo.Version">
+            <summary>Version of the assembly</summary>
+        </member>
+        <member name="F:log4net.AssemblyInfo.TargetFrameworkVersion">
+            <summary>Version of the framework targeted</summary>
+        </member>
+        <member name="F:log4net.AssemblyInfo.TargetFramework">
+            <summary>Type of framework targeted</summary>
+        </member>
+        <member name="F:log4net.AssemblyInfo.ClientProfile">
+            <summary>Does it target a client profile?</summary>
+        </member>
+        <member name="P:log4net.AssemblyInfo.Info">
+            <summary>
+            Identifies the version and target for this assembly.
+            </summary>
+        </member>
+        <member name="T:log4net.LogicalThreadContext">
+            <summary>
+            The log4net Logical Thread Context.
+            </summary>
+            <remarks>
+            <para>
+            The <c>LogicalThreadContext</c> provides a location for <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> specific debugging 
+            information to be stored.
+            The <c>LogicalThreadContext</c> properties override any <see cref="T:log4net.ThreadContext"/> or <see cref="T:log4net.GlobalContext"/>
+            properties with the same name.
+            </para>
+            <para>
+            For .NET Standard 1.3 this class uses
+            System.Threading.AsyncLocal rather than <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>.
+            </para>
+            <para>
+            The Logical Thread Context has a properties map and a stack.
+            The properties and stack can 
+            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
+            supports selecting and outputting these properties.
+            </para>
+            <para>
+            The Logical Thread Context provides a diagnostic context for the current call context. 
+            This is an instrument for distinguishing interleaved log
+            output from different sources. Log output is typically interleaved
+            when a server handles multiple clients near-simultaneously.
+            </para>
+            <para>
+            The Logical Thread Context is managed on a per <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> basis.
+            </para>
+            <para>
+            The <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> requires a link time 
+            <see cref="T:System.Security.Permissions.SecurityPermission"/> for the
+            <see cref="F:System.Security.Permissions.SecurityPermissionFlag.Infrastructure"/>.
+            If the calling code does not have this permission then this context will be disabled.
+            It will not store any property values set on it.
+            </para>
+            </remarks>
+            <example>Example of using the thread context properties to store a username.
+            <code lang="C#">
+            LogicalThreadContext.Properties["user"] = userName;
+            log.Info("This log message has a LogicalThreadContext Property called 'user'");
+            </code>
+            </example>
+            <example>Example of how to push a message into the context stack
+            <code lang="C#">
+            using(LogicalThreadContext.Stacks["LDC"].Push("my context message"))
+            {
+            	log.Info("This log message has a LogicalThreadContext Stack message that includes 'my context message'");
+            
+            } // at the end of the using block the message is automatically popped 
+            </code>
+            </example>
+            <threadsafety static="true" instance="true"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.LogicalThreadContext.#ctor">
+            <summary>
+            Private Constructor. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to prevent instantiation of this class.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.LogicalThreadContext.s_properties">
+            <summary>
+            The thread context properties instance
+            </summary>
+        </member>
+        <member name="F:log4net.LogicalThreadContext.s_stacks">
+            <summary>
+            The thread context stacks instance
+            </summary>
+        </member>
+        <member name="P:log4net.LogicalThreadContext.Properties">
+            <summary>
+            The thread properties map
+            </summary>
+            <value>
+            The thread properties map
+            </value>
+            <remarks>
+            <para>
+            The <c>LogicalThreadContext</c> properties override any <see cref="T:log4net.ThreadContext"/> 
+            or <see cref="T:log4net.GlobalContext"/> properties with the same name.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.LogicalThreadContext.Stacks">
+            <summary>
+            The thread stacks
+            </summary>
+            <value>
+            stack map
+            </value>
+            <remarks>
+            <para>
+            The logical thread stacks.
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.LogManager">
+            <summary>
+            This class is used by client applications to request logger instances.
+            </summary>
+            <remarks>
+            <para>
+            This class has static methods that are used by a client to request
+            a logger instance. The <see cref="M:GetLogger(string)"/> method is 
+            used to retrieve a logger.
+            </para>
+            <para>
+            See the <see cref="T:log4net.ILog"/> interface for more details.
+            </para>
+            </remarks>
+            <example>Simple example of logging messages
+            <code lang="C#">
+            ILog log = LogManager.GetLogger("application-log");
+            
+            log.Info("Application Start");
+            log.Debug("This is a debug message");
+            
+            if (log.IsDebugEnabled)
+            {
+            	log.Debug("This is another debug message");
+            }
+            </code>
+            </example>
+            <threadsafety static="true" instance="true"/>
+            <seealso cref="T:log4net.ILog"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.LogManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.LogManager"/> class. 
+            </summary>
+            <remarks>
+            Uses a private access modifier to prevent instantiation of this class.
+            </remarks>
+        </member>
+        <member name="M:log4net.LogManager.Exists(System.String)">
+            <overloads>Returns the named logger if it exists.</overloads>
+            <summary>
+            Returns the named logger if it exists.
+            </summary>
+            <remarks>
+            <para>
+            If the named logger exists (in the default repository) then it
+            returns a reference to the logger, otherwise it returns <c>null</c>.
+            </para>
+            </remarks>
+            <param name="name">The fully qualified logger name to look for.</param>
+            <returns>The logger found, or <c>null</c> if no logger could be found.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetCurrentLoggers">
+            <overloads>Get the currently defined loggers.</overloads>
+            <summary>
+            Returns all the currently defined loggers in the default repository.
+            </summary>
+            <remarks>
+            <para>The root logger is <b>not</b> included in the returned array.</para>
+            </remarks>
+            <returns>All the defined loggers.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.String)">
+            <overloads>Get or create a logger.</overloads>
+            <summary>
+            Retrieves or creates a named logger.
+            </summary>
+            <remarks>
+            <para>
+            Retrieves a logger named as the <paramref name="name"/>
+            parameter. If the named logger already exists, then the
+            existing instance will be returned. Otherwise, a new instance is
+            created.
+            </para>
+            <para>By default, loggers do not have a set level but inherit
+            it from the hierarchy. This is one of the central features of
+            log4net.
+            </para>
+            </remarks>
+            <param name="name">The name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.Exists(System.String,System.String)">
+            <summary>
+            Returns the named logger if it exists.
+            </summary>
+            <remarks>
+            <para>
+            If the named logger exists (in the specified repository) then it
+            returns a reference to the logger, otherwise it returns
+            <c>null</c>.
+            </para>
+            </remarks>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="name">The fully qualified logger name to look for.</param>
+            <returns>
+            The logger found, or <c>null</c> if the logger doesn't exist in the specified 
+            repository.
+            </returns>
+        </member>
+        <member name="M:log4net.LogManager.Exists(System.Reflection.Assembly,System.String)">
+            <summary>
+            Returns the named logger if it exists.
+            </summary>
+            <remarks>
+            <para>
+            If the named logger exists (in the repository for the specified assembly) then it
+            returns a reference to the logger, otherwise it returns
+            <c>null</c>.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <param name="name">The fully qualified logger name to look for.</param>
+            <returns>
+            The logger, or <c>null</c> if the logger doesn't exist in the specified
+            assembly's repository.
+            </returns>
+        </member>
+        <member name="M:log4net.LogManager.GetCurrentLoggers(System.String)">
+            <summary>
+            Returns all the currently defined loggers in the specified repository.
+            </summary>
+            <param name="repository">The repository to lookup in.</param>
+            <remarks>
+            The root logger is <b>not</b> included in the returned array.
+            </remarks>
+            <returns>All the defined loggers.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetCurrentLoggers(System.Reflection.Assembly)">
+            <summary>
+            Returns all the currently defined loggers in the specified assembly's repository.
+            </summary>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <remarks>
+            The root logger is <b>not</b> included in the returned array.
+            </remarks>
+            <returns>All the defined loggers.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.String,System.String)">
+            <summary>
+            Retrieves or creates a named logger.
+            </summary>
+            <remarks>
+            <para>
+            Retrieve a logger named as the <paramref name="name"/>
+            parameter. If the named logger already exists, then the
+            existing instance will be returned. Otherwise, a new instance is
+            created.
+            </para>
+            <para>
+            By default, loggers do not have a set level but inherit
+            it from the hierarchy. This is one of the central features of
+            log4net.
+            </para>
+            </remarks>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="name">The name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.String)">
+            <summary>
+            Retrieves or creates a named logger.
+            </summary>
+            <remarks>
+            <para>
+            Retrieve a logger named as the <paramref name="name"/>
+            parameter. If the named logger already exists, then the
+            existing instance will be returned. Otherwise, a new instance is
+            created.
+            </para>
+            <para>
+            By default, loggers do not have a set level but inherit
+            it from the hierarchy. This is one of the central features of
+            log4net.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <param name="name">The name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.Type)">
+            <summary>
+            Shorthand for <see cref="M:LogManager.GetLogger(string)"/>.
+            </summary>
+            <remarks>
+            Get the logger for the fully qualified name of the type specified.
+            </remarks>
+            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.String,System.Type)">
+            <summary>
+            Shorthand for <see cref="M:LogManager.GetLogger(string)"/>.
+            </summary>
+            <remarks>
+            Gets the logger for the fully qualified name of the type specified.
+            </remarks>
+            <param name="repository">The repository to lookup in.</param>
+            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Shorthand for <see cref="M:LogManager.GetLogger(string)"/>.
+            </summary>
+            <remarks>
+            Gets the logger for the fully qualified name of the type specified.
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
+            <returns>The logger with the name specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.Shutdown">
+            <summary>
+            Shuts down the log4net system.
+            </summary>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in all the
+            default repositories.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.LogManager.ShutdownRepository">
+            <overloads>Shutdown a logger repository.</overloads>
+            <summary>
+            Shuts down the default repository.
+            </summary>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in the
+            default repository.
+            </para>
+            <para>Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.LogManager.ShutdownRepository(System.String)">
+            <summary>
+            Shuts down the repository for the repository specified.
+            </summary>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in the
+            <paramref name="repository"/> specified.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+            <param name="repository">The repository to shutdown.</param>
+        </member>
+        <member name="M:log4net.LogManager.ShutdownRepository(System.Reflection.Assembly)">
+            <summary>
+            Shuts down the repository specified.
+            </summary>
+            <remarks>
+            <para>
+            Calling this method will <b>safely</b> close and remove all
+            appenders in all the loggers including root contained in the
+            repository. The repository is looked up using
+            the <paramref name="repositoryAssembly"/> specified.
+            </para>
+            <para>
+            Some appenders need to be closed before the application exists. 
+            Otherwise, pending logging events might be lost.
+            </para>
+            <para>
+            The <c>shutdown</c> method is careful to close nested
+            appenders before closing regular appenders. This is allows
+            configurations where a regular appender is attached to a logger
+            and again to a nested appender.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+        </member>
+        <member name="M:log4net.LogManager.ResetConfiguration">
+            <overloads>Reset the configuration of a repository</overloads>
+            <summary>
+            Resets all values contained in this repository instance to their defaults.
+            </summary>
+            <remarks>
+            <para>
+            Resets all values contained in the repository instance to their
+            defaults.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set to its default "off" value.
+            </para>		
+            </remarks>
+        </member>
+        <member name="M:log4net.LogManager.ResetConfiguration(System.String)">
+            <summary>
+            Resets all values contained in this repository instance to their defaults.
+            </summary>
+            <remarks>
+            <para>
+            Reset all values contained in the repository instance to their
+            defaults.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set to its default "off" value.
+            </para>		
+            </remarks>
+            <param name="repository">The repository to reset.</param>
+        </member>
+        <member name="M:log4net.LogManager.ResetConfiguration(System.Reflection.Assembly)">
+            <summary>
+            Resets all values contained in this repository instance to their defaults.
+            </summary>
+            <remarks>
+            <para>
+            Reset all values contained in the repository instance to their
+            defaults.  This removes all appenders from all loggers, sets
+            the level of all non-root loggers to <c>null</c>,
+            sets their additivity flag to <c>true</c> and sets the level
+            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
+            message disabling is set to its default "off" value.
+            </para>		
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository to reset.</param>
+        </member>
+        <member name="M:log4net.LogManager.GetLoggerRepository">
+            <overloads>Get the logger repository.</overloads>
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the callers assembly (<see cref="M:Assembly.GetCallingAssembly()"/>).
+            </para>
+            </remarks>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> instance for the default repository.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetLoggerRepository(System.String)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repository"/> argument.
+            </para>
+            </remarks>
+            <param name="repository">The repository to lookup in.</param>
+        </member>
+        <member name="M:log4net.LogManager.GetLoggerRepository(System.Reflection.Assembly)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repositoryAssembly"/> argument.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+        </member>
+        <member name="M:log4net.LogManager.GetRepository">
+            <overloads>Get a logger repository.</overloads>
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the callers assembly (<see cref="M:Assembly.GetCallingAssembly()"/>).
+            </para>
+            </remarks>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> instance for the default repository.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetRepository(System.String)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repository"/> argument.
+            </para>
+            </remarks>
+            <param name="repository">The repository to lookup in.</param>
+        </member>
+        <member name="M:log4net.LogManager.GetRepository(System.Reflection.Assembly)">
+            <summary>
+            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
+            </summary>
+            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
+            <remarks>
+            <para>
+            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
+            by the <paramref name="repositoryAssembly"/> argument.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
+        </member>
+        <member name="M:log4net.LogManager.CreateDomain(System.Type)">
+            <overloads>Create a domain</overloads>
+            <summary>
+            Creates a repository with the specified repository type.
+            </summary>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository()"/> will return 
+            the same repository instance.
+            </para>
+            </remarks>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+        </member>
+        <member name="M:log4net.LogManager.CreateRepository(System.Type)">
+            <overloads>Create a logger repository.</overloads>
+            <summary>
+            Creates a repository with the specified repository type.
+            </summary>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository()"/> will return 
+            the same repository instance.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.LogManager.CreateDomain(System.String)">
+            <summary>
+            Creates a repository with the specified name.
+            </summary>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
+            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.LogManager.CreateRepository(System.String)">
+            <summary>
+            Creates a repository with the specified name.
+            </summary>
+            <remarks>
+            <para>
+            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
+            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.LogManager.CreateDomain(System.String,System.Type)">
+            <summary>
+            Creates a repository with the specified name and repository type.
+            </summary>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <param name="repository">The name of the repository, this must be unique to the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.LogManager.CreateRepository(System.String,System.Type)">
+            <summary>
+            Creates a repository with the specified name and repository type.
+            </summary>
+            <remarks>
+            <para>
+            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
+            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
+            </para>
+            </remarks>
+            <param name="repository">The name of the repository, this must be unique to the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
+        </member>
+        <member name="M:log4net.LogManager.CreateDomain(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Creates a repository for the specified assembly and repository type.
+            </summary>
+            <remarks>
+            <para>
+            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
+            </para>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+        </member>
+        <member name="M:log4net.LogManager.CreateRepository(System.Reflection.Assembly,System.Type)">
+            <summary>
+            Creates a repository for the specified assembly and repository type.
+            </summary>
+            <remarks>
+            <para>
+            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
+            specified such that a call to <see cref="M:GetRepository(Assembly)"/> with the
+            same assembly specified will return the same repository instance.
+            </para>
+            </remarks>
+            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
+            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
+            and has a no arg constructor. An instance of this type will be created to act
+            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
+            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
+        </member>
+        <member name="M:log4net.LogManager.GetAllRepositories">
+            <summary>
+            Gets the list of currently defined repositories.
+            </summary>
+            <remarks>
+            <para>
+            Get an array of all the <see cref="T:log4net.Repository.ILoggerRepository"/> objects that have been created.
+            </para>
+            </remarks>
+            <returns>An array of all the known <see cref="T:log4net.Repository.ILoggerRepository"/> objects.</returns>
+        </member>
+        <member name="M:log4net.LogManager.Flush(System.Int32)">
+            <summary>
+            Flushes logging events buffered in all configured appenders in the default repository.
+            </summary>
+            <param name="millisecondsTimeout">The maximum time in milliseconds to wait for logging events from asycnhronous appenders to be flushed.</param>
+            <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns>
+        </member>
+        <member name="M:log4net.LogManager.WrapLogger(log4net.Core.ILogger)">
+            <summary>
+            Looks up the wrapper object for the logger specified.
+            </summary>
+            <param name="logger">The logger to get the wrapper for.</param>
+            <returns>The wrapper for the logger specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.WrapLoggers(log4net.Core.ILogger[])">
+            <summary>
+            Looks up the wrapper objects for the loggers specified.
+            </summary>
+            <param name="loggers">The loggers to get the wrappers for.</param>
+            <returns>The wrapper objects for the loggers specified.</returns>
+        </member>
+        <member name="M:log4net.LogManager.WrapperCreationHandler(log4net.Core.ILogger)">
+            <summary>
+            Create the <see cref="T:log4net.Core.ILoggerWrapper"/> objects used by
+            this manager.
+            </summary>
+            <param name="logger">The logger to wrap.</param>
+            <returns>The wrapper for the logger specified.</returns>
+        </member>
+        <member name="F:log4net.LogManager.s_wrapperMap">
+            <summary>
+            The wrapper map to use to hold the <see cref="T:log4net.Core.LogImpl"/> objects.
+            </summary>
+        </member>
+        <member name="T:log4net.MDC">
+            <summary>
+            Implementation of Mapped Diagnostic Contexts.
+            </summary>
+            <remarks>
+            <note>
+            <para>
+            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
+            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
+            </para>
+            </note>
+            <para>
+            The MDC class is similar to the <see cref="T:log4net.NDC"/> class except that it is
+            based on a map instead of a stack. It provides <i>mapped
+            diagnostic contexts</i>. A <i>Mapped Diagnostic Context</i>, or
+            MDC in short, is an instrument for distinguishing interleaved log
+            output from different sources. Log output is typically interleaved
+            when a server handles multiple clients near-simultaneously.
+            </para>
+            <para>
+            The MDC is managed on a per thread basis.
+            </para>
+            </remarks>
+            <threadsafety static="true" instance="true"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.MDC.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.MDC"/> class. 
+            </summary>
+            <remarks>
+            Uses a private access modifier to prevent instantiation of this class.
+            </remarks>
+        </member>
+        <member name="M:log4net.MDC.Get(System.String)">
+            <summary>
+            Gets the context value identified by the <paramref name="key"/> parameter.
+            </summary>
+            <param name="key">The key to lookup in the MDC.</param>
+            <returns>The string value held for the key, or a <c>null</c> reference if no corresponding value is found.</returns>
+            <remarks>
+            <note>
+            <para>
+            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
+            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
+            </para>
+            </note>
+            <para>
+            If the <paramref name="key"/> parameter does not look up to a
+            previously defined context then <c>null</c> will be returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.MDC.Set(System.String,System.String)">
+            <summary>
+            Add an entry to the MDC
+            </summary>
+            <param name="key">The key to store the value under.</param>
+            <param name="value">The value to store.</param>
+            <remarks>
+            <note>
+            <para>
+            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
+            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
+            </para>
+            </note>
+            <para>
+            Puts a context value (the <paramref name="value"/> parameter) as identified
+            with the <paramref name="key"/> parameter into the current thread's
+            context map.
+            </para>
+            <para>
+            If a value is already defined for the <paramref name="key"/>
+            specified then the value will be replaced. If the <paramref name="value"/> 
+            is specified as <c>null</c> then the key value mapping will be removed.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.MDC.Remove(System.String)">
+            <summary>
+            Removes the key value mapping for the key specified.
+            </summary>
+            <param name="key">The key to remove.</param>
+            <remarks>
+            <note>
+            <para>
+            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
+            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
+            </para>
+            </note>
+            <para>
+            Remove the specified entry from this thread's MDC
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.MDC.Clear">
+            <summary>
+            Clear all entries in the MDC
+            </summary>
+            <remarks>
+            <note>
+            <para>
+            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
+            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
+            </para>
+            </note>
+            <para>
+            Remove all the entries from this thread's MDC
+            </para>
+            </remarks>
+        </member>
+        <member name="T:log4net.NDC">
+            <summary>
+            Implementation of Nested Diagnostic Contexts.
+            </summary>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            A Nested Diagnostic Context, or NDC in short, is an instrument
+            to distinguish interleaved log output from different sources. Log
+            output is typically interleaved when a server handles multiple
+            clients near-simultaneously.
+            </para>
+            <para>
+            Interleaved log output can still be meaningful if each log entry
+            from different contexts had a distinctive stamp. This is where NDCs
+            come into play.
+            </para>
+            <para>
+            Note that NDCs are managed on a per thread basis. The NDC class
+            is made up of static methods that operate on the context of the
+            calling thread.
+            </para>
+            </remarks>
+            <example>How to push a message into the context
+            <code lang="C#">
+            using(NDC.Push("my context message"))
+            {
+            	... all log calls will have 'my context message' included ...
+            
+            } // at the end of the using block the message is automatically removed 
+            </code>
+            </example>
+            <threadsafety static="true" instance="true"/>
+            <author>Nicko Cadell</author>
+            <author>Gert Driesen</author>
+        </member>
+        <member name="M:log4net.NDC.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:log4net.NDC"/> class. 
+            </summary>
+            <remarks>
+            Uses a private access modifier to prevent instantiation of this class.
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.Clear">
+            <summary>
+            Clears all the contextual information held on the current thread.
+            </summary>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            Clears the stack of NDC data held on the current thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.CloneStack">
+            <summary>
+            Creates a clone of the stack of context information.
+            </summary>
+            <returns>A clone of the context info for this thread.</returns>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            The results of this method can be passed to the <see cref="M:log4net.NDC.Inherit(System.Collections.Stack)"/> 
+            method to allow child threads to inherit the context of their 
+            parent thread.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.Inherit(System.Collections.Stack)">
+            <summary>
+            Inherits the contextual information from another thread.
+            </summary>
+            <param name="stack">The context stack to inherit.</param>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            This thread will use the context information from the stack
+            supplied. This can be used to initialize child threads with
+            the same contextual information as their parent threads. These
+            contexts will <b>NOT</b> be shared. Any further contexts that
+            are pushed onto the stack will not be visible to the other.
+            Call <see cref="M:log4net.NDC.CloneStack"/> to obtain a stack to pass to
+            this method.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.Pop">
+            <summary>
+            Removes the top context from the stack.
+            </summary>
+            <returns>
+            The message in the context that was removed from the top 
+            of the stack.
+            </returns>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            Remove the top context from the stack, and return
+            it to the caller. If the stack is empty then an
+            empty string (not <c>null</c>) is returned.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.Push(System.String)">
+            <summary>
+            Pushes a new context message.
+            </summary>
+            <param name="message">The new context message.</param>
+            <returns>
+            An <see cref="T:System.IDisposable"/> that can be used to clean up 
+            the context stack.
+            </returns>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            Pushes a new context onto the context stack. An <see cref="T:System.IDisposable"/>
+            is returned that can be used to clean up the context stack. This
+            can be easily combined with the <c>using</c> keyword to scope the
+            context.
+            </para>
+            </remarks>
+            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
+            <code lang="C#">
+            using(log4net.NDC.Push("NDC_Message"))
+            {
+            	log.Warn("This should have an NDC message");
+            }
+            </code>
+            </example>
+        </member>
+        <member name="M:log4net.NDC.PushFormat(System.String,System.Object[])">
+            <summary>
+            Pushes a new context message.
+            </summary>
+            <param name="messageFormat">The new context message string format.</param>
+            <param name="args">Arguments to be passed into messageFormat.</param>
+            <returns>
+            An <see cref="T:System.IDisposable"/> that can be used to clean up 
+            the context stack.
+            </returns>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            Pushes a new context onto the context stack. An <see cref="T:System.IDisposable"/>
+            is returned that can be used to clean up the context stack. This
+            can be easily combined with the <c>using</c> keyword to scope the
+            context.
+            </para>
+            </remarks>
+            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
+            <code lang="C#">
+            var someValue = "ExampleContext"
+            using(log4net.NDC.PushFormat("NDC_Message {0}", someValue))
+            {
+            	log.Warn("This should have an NDC message");
+            }
+            </code>
+            </example>
+        </member>
+        <member name="M:log4net.NDC.Remove">
+            <summary>
+            Removes the context information for this thread. It is
+            not required to call this method.
+            </summary>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            This method is not implemented.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:log4net.NDC.SetMaxDepth(System.Int32)">
+            <summary>
+            Forces the stack depth to be at most <paramref name="maxDepth"/>.
+            </summary>
+            <param name="maxDepth">The maximum depth of the stack</param>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            Forces the stack depth to be at most <paramref name="maxDepth"/>.
+            This may truncate the head of the stack. This only affects the 
+            stack in the current thread. Also it does not prevent it from
+            growing, it only sets the maximum depth at the time of the
+            call. This can be used to return to a known context depth.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.NDC.Depth">
+            <summary>
+            Gets the current context depth.
+            </summary>
+            <value>The current context depth.</value>
+            <remarks>
+            <note>
+            <para>
+            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
+            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
+            </para>
+            </note>
+            <para>
+            The number of context values pushed onto the context stack.
+            </para>
+            <para>
+            Used to record the current depth of the context. This can then 
+            be restored using the <see cref="M:log4net.NDC.SetMaxDepth(System.Int32)"/> method.
+            </para>
+            </remarks>
+            <seealso cref="M:log4net.NDC.SetMaxDepth(System.Int32)"/>
+        </member>
+        <member name="T:log4net.ThreadContext">
+            <summary>
+            The log4net Thread Context.
+            </summary>
+            <remarks>
+            <para>
+            The <c>ThreadContext</c> provides a location for thread specific debugging 
+            information to be stored.
+            The <c>ThreadContext</c> properties override any <see cref="T:log4net.GlobalContext"/>
+            properties with the same name.
+            </para>
+            <para>
+            The thread context has a properties map and a stack.
+            The properties and stack can 
+            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
+            supports selecting and outputting these properties.
+            </para>
+            <para>
+            The Thread Context provides a diagnostic context for the current thread. 
+            This is an instrument for distinguishing interleaved log
+            output from different sources. Log output is typically interleaved
+            when a server handles multiple clients near-simultaneously.
+            </para>
+            <para>
+            The Thread Context is managed on a per thread basis.
+            </para>
+            </remarks>
+            <example>Example of using the thread context properties to store a username.
+            <code lang="C#">
+            ThreadContext.Properties["user"] = userName;
+            log.Info("This log message has a ThreadContext Property called 'user'");
+            </code>
+            </example>
+            <example>Example of how to push a message into the context stack
+            <code lang="C#">
+            using(ThreadContext.Stacks["NDC"].Push("my context message"))
+            {
+            	log.Info("This log message has a ThreadContext Stack message that includes 'my context message'");
+            
+            } // at the end of the using block the message is automatically popped 
+            </code>
+            </example>
+            <threadsafety static="true" instance="true"/>
+            <author>Nicko Cadell</author>
+        </member>
+        <member name="M:log4net.ThreadContext.#ctor">
+            <summary>
+            Private Constructor. 
+            </summary>
+            <remarks>
+            <para>
+            Uses a private access modifier to prevent instantiation of this class.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:log4net.ThreadContext.s_properties">
+            <summary>
+            The thread context properties instance
+            </summary>
+        </member>
+        <member name="F:log4net.ThreadContext.s_stacks">
+            <summary>
+            The thread context stacks instance
+            </summary>
+        </member>
+        <member name="P:log4net.ThreadContext.Properties">
+            <summary>
+            The thread properties map
+            </summary>
+            <value>
+            The thread properties map
+            </value>
+            <remarks>
+            <para>
+            The <c>ThreadContext</c> properties override any <see cref="T:log4net.GlobalContext"/>
+            properties with the same name.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:log4net.ThreadContext.Stacks">
+            <summary>
+            The thread stacks
+            </summary>
+            <value>
+            stack map
+            </value>
+            <remarks>
+            <para>
+            The thread local stacks.
+            </para>
+            </remarks>
+        </member>
+    </members>
+</doc>
diff --git a/Bin/myLog.dll b/Bin/myLog.dll
new file mode 100644
index 0000000..4e3e801
Binary files /dev/null and b/Bin/myLog.dll differ
diff --git a/Bin/myLog.pdb b/Bin/myLog.pdb
new file mode 100644
index 0000000..614dc36
Binary files /dev/null and b/Bin/myLog.pdb differ
diff --git a/DXTempFolder/BinaryData/20ec0b42-896c-41a0-985b-74d43185b991Page1_WebChartInOrders2.bmp b/DXTempFolder/BinaryData/20ec0b42-896c-41a0-985b-74d43185b991Page1_WebChartInOrders2.bmp
new file mode 100644
index 0000000..db1e4d9
Binary files /dev/null and b/DXTempFolder/BinaryData/20ec0b42-896c-41a0-985b-74d43185b991Page1_WebChartInOrders2.bmp differ
diff --git a/DXTempFolder/BinaryData/234d5061-85ed-4df3-bd78-a7558d5cf9b4Page1_WebChartOutOrders.bmp b/DXTempFolder/BinaryData/234d5061-85ed-4df3-bd78-a7558d5cf9b4Page1_WebChartOutOrders.bmp
new file mode 100644
index 0000000..c5d1ae3
Binary files /dev/null and b/DXTempFolder/BinaryData/234d5061-85ed-4df3-bd78-a7558d5cf9b4Page1_WebChartOutOrders.bmp differ
diff --git a/DXTempFolder/BinaryData/3b374027-dbae-4280-8171-bcb4513ca357Page1_WebChartInOutLines.bmp b/DXTempFolder/BinaryData/3b374027-dbae-4280-8171-bcb4513ca357Page1_WebChartInOutLines.bmp
new file mode 100644
index 0000000..a400d06
Binary files /dev/null and b/DXTempFolder/BinaryData/3b374027-dbae-4280-8171-bcb4513ca357Page1_WebChartInOutLines.bmp differ
diff --git a/DXTempFolder/BinaryData/4f87dab5-417d-418f-bd17-64f301204ddePage1_WebChartInOrders.bmp b/DXTempFolder/BinaryData/4f87dab5-417d-418f-bd17-64f301204ddePage1_WebChartInOrders.bmp
new file mode 100644
index 0000000..6426a04
Binary files /dev/null and b/DXTempFolder/BinaryData/4f87dab5-417d-418f-bd17-64f301204ddePage1_WebChartInOrders.bmp differ
diff --git a/DXTempFolder/BinaryData/5dcb3185-e1a4-4f12-a394-8d78b96cc9ccPage1_WebChartLocs.bmp b/DXTempFolder/BinaryData/5dcb3185-e1a4-4f12-a394-8d78b96cc9ccPage1_WebChartLocs.bmp
new file mode 100644
index 0000000..5a2928e
Binary files /dev/null and b/DXTempFolder/BinaryData/5dcb3185-e1a4-4f12-a394-8d78b96cc9ccPage1_WebChartLocs.bmp differ
diff --git a/DXTempFolder/BinaryData/77b211fc-a02b-42e6-bb08-70dc2d6bfa76Page1_WebChartTasks.bmp b/DXTempFolder/BinaryData/77b211fc-a02b-42e6-bb08-70dc2d6bfa76Page1_WebChartTasks.bmp
new file mode 100644
index 0000000..34a8ad4
Binary files /dev/null and b/DXTempFolder/BinaryData/77b211fc-a02b-42e6-bb08-70dc2d6bfa76Page1_WebChartTasks.bmp differ
diff --git a/DXTempFolder/BinaryData/8ed4471f-8746-4410-9538-641a4e3d9d69Page1_WebChartStatePie.bmp b/DXTempFolder/BinaryData/8ed4471f-8746-4410-9538-641a4e3d9d69Page1_WebChartStatePie.bmp
new file mode 100644
index 0000000..08bd25e
Binary files /dev/null and b/DXTempFolder/BinaryData/8ed4471f-8746-4410-9538-641a4e3d9d69Page1_WebChartStatePie.bmp differ
diff --git a/DXTempFolder/BinaryData/bb3fd5c4-ee4b-464c-85ff-73c221bd18eaPage1_WebChartEmpTasks.bmp b/DXTempFolder/BinaryData/bb3fd5c4-ee4b-464c-85ff-73c221bd18eaPage1_WebChartEmpTasks.bmp
new file mode 100644
index 0000000..68c0818
Binary files /dev/null and b/DXTempFolder/BinaryData/bb3fd5c4-ee4b-464c-85ff-73c221bd18eaPage1_WebChartEmpTasks.bmp differ
diff --git a/DXTempFolder/BinaryData/d5cf3cd0-a0f0-4ff3-88f8-5ad7826769afPage1_WebChartPartTasks.bmp b/DXTempFolder/BinaryData/d5cf3cd0-a0f0-4ff3-88f8-5ad7826769afPage1_WebChartPartTasks.bmp
new file mode 100644
index 0000000..e48c956
Binary files /dev/null and b/DXTempFolder/BinaryData/d5cf3cd0-a0f0-4ff3-88f8-5ad7826769afPage1_WebChartPartTasks.bmp differ
diff --git a/Default.aspx b/Default.aspx
new file mode 100644
index 0000000..ae3a6cc
--- /dev/null
+++ b/Default.aspx
@@ -0,0 +1,14 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" Title="Untitled Page" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <asp:TextBox id="TextBox11" runat="server" Visible ="false">
+    </asp:TextBox>
+    <asp:TextBox id="TextBox12" runat="server"   Visible ="false">
+    </asp:TextBox>
+    <asp:Button id="Button1" runat="server" OnClick="Button1_Click" Text="Button" Visible ="false" />
+    <cc1:calendarextender id="CalendarExtender11" runat="server" targetcontrolid="TextBox11"></cc1:calendarextender>
+    <cc1:calendarextender id="CalendarExtender12" runat="server" cssclass="MyCalendar"
+        firstdayofweek="Monday" targetcontrolid="TextBox12"></cc1:calendarextender>
+</asp:Content>
+
diff --git a/Default.aspx.cs b/Default.aspx.cs
new file mode 100644
index 0000000..4cd9d78
--- /dev/null
+++ b/Default.aspx.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class _Default : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Response.Redirect("index.aspx",true);
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+        if ((Session["CurrentUser"] != null))
+        {
+
+            if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                if (Session["CurrentUserId"] != null)
+                {
+                    //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());abc
+                    DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                    logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                }
+        }
+    }
+}
diff --git a/Desktop.aspx b/Desktop.aspx
new file mode 100644
index 0000000..504fcbb
--- /dev/null
+++ b/Desktop.aspx
@@ -0,0 +1,194 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true"   ClassName="Desktop"     
+    CodeFile="Desktop.aspx.cs" Inherits="Desktop" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table class="Table_NoBorder" width="100%">
+     
+        <tr>
+            <td colspan="2" align="left">
+                <asp:Label ID="Label5" runat="server" CssClass="Label" Text='系统提示板'></asp:Label></td>
+        </tr>
+         
+        <tr>
+            <td colspan="2" align="left" style="height: 12px">
+                <asp:Label ID="Label4" runat="server" CssClass="Label" Text='工作计划'></asp:Label></td>
+        </tr>
+         
+        <tr>
+            <td colspan="2">
+                <table class="Table_Border" width="100%" border="0">
+                    <tr class="HeaderStyle">
+                        <td>
+                            &nbsp;<asp:Label ID="lbToday" runat="server" CssClass="Label" Text="今天"></asp:Label></td>
+                        <td>
+                            &nbsp;<asp:Label ID="lbTomorrow" runat="server" CssClass="Label" Text="明天"></asp:Label></td>
+                        <td>
+                            &nbsp;<asp:Label ID="lbafterTomorrow" runat="server" CssClass="Label" Text="后天"></asp:Label></td>
+                    </tr>
+                    <tr>
+                        <td width="33%" valign="top">
+                            <asp:GridView ID="gvWorkplan1" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                DataKeyNames="ID" EmptyDataText="没有数据。" PagerStyle-HorizontalAlign="Right"
+                                ShowFooter="True" Width="100%">
+                                <Columns>
+                                    <asp:BoundField Visible="false" DataField="ID" SortExpression="ID"
+                                        HeaderText="workplanid"></asp:BoundField>
+                                    <asp:BoundField Visible="false" DataField="wpd_workplan" SortExpression="wpd_workplan"
+                                        HeaderText="wpd_workplanid"></asp:BoundField>
+                                    <asp:BoundField DataField="wpd_number" SortExpression="wpd_number" HeaderText="序号">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_content" SortExpression="wpd_content" HeaderText="计划内容">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_mem" SortExpression="wpd_mem" HeaderText="计划说明">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                </Columns>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center" />
+                                <EmptyDataTemplate>
+                                    没有可显示的工作计划
+                                </EmptyDataTemplate>
+                                <SelectedRowStyle CssClass="SelectedItemStyle" />
+                                <PagerStyle HorizontalAlign="Right" />
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center" />
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle" />
+                            </asp:GridView>
+                        </td>
+                        <td width="33%" valign="top">
+                            <asp:GridView ID="gvWorkplan2" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                DataKeyNames="ID" EmptyDataText="没有数据。" PagerStyle-HorizontalAlign="Right"
+                                ShowFooter="True" Width="100%">
+                                <Columns>
+                                    <asp:BoundField Visible="false" DataField="ID" SortExpression="ID"
+                                        HeaderText="workplanid"></asp:BoundField>
+                                    <asp:BoundField Visible="false" DataField="wpd_workplan" SortExpression="wpd_workplan"
+                                        HeaderText="wpd_workplanid">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_number" SortExpression="wpd_number" HeaderText="序号">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_content" SortExpression="wpd_content" HeaderText="计划内容">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_mem" SortExpression="wpd_mem" HeaderText="计划说明">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                </Columns>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center" />
+                                <EmptyDataTemplate>
+                                    没有可显示的工作计划
+                                </EmptyDataTemplate>
+                                <SelectedRowStyle CssClass="SelectedItemStyle" />
+                                <PagerStyle HorizontalAlign="Right" />
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center" />
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle" />
+                            </asp:GridView>
+                        </td>
+                        <td width="33%" valign="top">
+                            <asp:GridView ID="gvWorkplan3" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                DataKeyNames="ID" EmptyDataText="没有数据。" PagerStyle-HorizontalAlign="Right"
+                                ShowFooter="True" Width="100%">
+                                <Columns>
+                                    <asp:BoundField Visible="false" DataField="ID" SortExpression="ID"
+                                        HeaderText="workplanid"></asp:BoundField>
+                                    <asp:BoundField Visible="false" DataField="wpd_workplan" SortExpression="wpd_workplan"
+                                        HeaderText="wpd_workplanid">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_number" SortExpression="wpd_number" HeaderText="序号">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_content" SortExpression="wpd_content" HeaderText="计划内容">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="wpd_mem" SortExpression="wpd_mem" HeaderText="计划说明">
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                </Columns>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center" />
+                                <EmptyDataTemplate>
+                                    没有可显示的工作计划
+                                </EmptyDataTemplate>
+                                <SelectedRowStyle CssClass="SelectedItemStyle" />
+                                <PagerStyle HorizontalAlign="Right" />
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center" />
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle" />
+                            </asp:GridView>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2" class="ALine">
+            </td>
+        </tr>
+        <tr class="HeaderStyle">
+            <td align="left" width="50%">
+                <asp:Label ID="Label8" runat="server" CssClass="Label" Text='个人信息'></asp:Label></td>
+            <!---td align="left">
+                <asp:Label ID="Label9" runat="server" CssClass="Label" Text='系统信息'></asp:Label></td  ---->
+        </tr>
+        
+        <tr>
+            <td valign="top"><asp:LinkButton ID="lkChgPswd" runat="server" OnClick="lkChgPswd_Click" >修改密码</asp:LinkButton>
+                <div runat="server" id="divPasswdChg" visible="false">
+                    <table class="Table_Border" width="50%">
+                        <tr>
+                            <td nowrap >
+                                <asp:Label ID="Label10" runat="server" CssClass="Label" Text="原密码"></asp:Label></td>
+                            <td  >
+                                <asp:TextBox ID="txtOldPasswd" CssClass="TextBox" runat="server" MaxLength="25" TextMode="Password"></asp:TextBox>
+                            </td>
+                            <td  ><asp:Button ID="btn_save" runat="server" Text="修改" CssClass="Button" OnClick="btn_save_Click" /> 
+                               </td>
+                            <td  > <asp:Label ID="lbPasswdNotice" runat="server" CssClass="Label" Text=""></asp:Label>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td nowrap > <asp:Label ID="Label11" runat="server" CssClass="Label" Text="新密码"></asp:Label>
+                                </td>
+                            <td>
+                                <asp:TextBox ID="txtNewPasswd" CssClass="TextBox" runat="server" MaxLength="25" TextMode="Password"></asp:TextBox>
+                            </td>
+                            <td>
+                               <asp:Button ID="btn_cancel" runat="server" Text="取消" CssClass="Button" OnClick="btn_cancel_Click"  /></td>
+                            <td  >
+                            </td>
+                        </tr>
+                         
+                    </table>
+                </div>
+                
+            </td>
+            <td valign="top"> 
+            
+              <asp:LinkButton ID="lkbtnusers" runat="server" OnClick="lkbtnusers_Click">在线用户</asp:LinkButton>
+              <div runat="server" id="divOnlineUsers" visible="false">
+                <table class="Table_Border" width="50%" border="0">
+                    <tr>
+                         
+                        <td  >
+                            <asp:Label ID="lbOnLineUserCnt" runat="server" CssClass="Label" Text=""> </asp:Label>
+                        </td>
+                     
+                       　
+                    </tr>
+                    
+                </table>
+                </div>
+            </td>
+        </tr>
+        <tr>
+        <td colspan="2">
+        
+
+        
+            &nbsp;</td>
+        </tr>
+    </table>
+    </asp:Content>
+      
diff --git a/Desktop.aspx.cs b/Desktop.aspx.cs
new file mode 100644
index 0000000..87a8785
--- /dev/null
+++ b/Desktop.aspx.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using ajax;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class Desktop : PageBase
+{
+  　
+    protected   void Page_Load(object sender, EventArgs e)
+    {
+       　
+        bindWorkplan();
+        //bindProjectInfo();
+        //bindTrainingInfo(); 
+        showOnlineUsers();
+    }
+
+    void bindWorkplan()
+    {
+        LWorkplan wp = new LWorkplan();
+        lbToday.Text = DateTime.Today.ToShortDateString();
+        lbTomorrow.Text = DateTime.Today.AddDays(1).ToShortDateString();
+        lbafterTomorrow.Text = DateTime.Today.AddDays(2).ToShortDateString();
+        gvWorkplan1.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbToday.Text);
+        gvWorkplan2.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbTomorrow.Text);
+        gvWorkplan3.DataSource = wp.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID, lbafterTomorrow.Text);
+        gvWorkplan3.DataBind();
+        gvWorkplan2.DataBind();
+        gvWorkplan1.DataBind();
+    }
+    /*
+    void bindProjectInfo()
+    {
+        LProject lpj = new LProject();
+     
+        //上个月
+
+
+        DataTable lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID,DateTime.Now.AddMonths(-1).Year.ToString(),
+                                                 DateTime.Now.AddMonths(-1).Month.ToString()) ;
+        DataView dv = lmDt.DefaultView;
+       //上个月通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";  
+        lbLMPassed.Text = dv.Count.ToString();
+
+        //上个月未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lblmFailed.Text = dv.Count.ToString();
+        //上个月待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交  + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 +   "') ";
+        lblm4submit.Text = dv.Count.ToString();
+
+
+       
+        //上个月得分
+        dv.RowFilter = string.Empty;
+        Double lmscore = 0;
+        for(int i =0;i<lmDt.Rows.Count;i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lblmScore.Text = lmscore.ToString();
+
+
+        //上月待审核
+        lb4preapprove.Text = "0";
+        if (lem.CanShenHe || lem.CanYuShen)  
+        {
+            lmDt = lpj.Get4ApproveList(lem.GetCanApproveDeptList(), DateTime.Now.AddMonths(-1).Year.ToString(),
+                                                    DateTime.Now.AddMonths(-1).Month.ToString());
+            dv = lmDt.DefaultView;
+            lb4preapprove.Text = dv.Count.ToString();
+        }
+        if (lem.CanKaoHe)   
+        {
+            dv = lpj.GetProjectsByYearMonth(DateTime.Now.AddMonths(-1).Year.ToString(),DateTime.Now.AddMonths(-1).Month.ToString()).DefaultView;  
+            dv.RowFilter = "pj_status in('" + ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "') and pd_status <>'"
+                        + ProjectDetailStatus.考核通过 +
+                    "' or pd_status in('" + ProjectDetailStatus.审核通过 + "')";
+             
+            lb4preapprove.Text = (Convert.ToInt32( lb4preapprove.Text)+ dv.Count).ToString();
+        }
+
+
+
+
+        //本月
+
+
+        lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID, DateTime.Now.Year.ToString(),
+                                                 DateTime.Now.Month.ToString());
+        dv = lmDt.DefaultView;
+        //本月通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";
+        lbpassed.Text = dv.Count.ToString();
+
+        //本月未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lbfailed.Text = dv.Count.ToString();
+
+
+        //本月得分
+        dv.RowFilter = string.Empty;
+        lmscore = 0;
+        for (int i = 0; i < lmDt.Rows.Count; i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lbscore.Text = lmscore.ToString();
+
+        //本月待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交 + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 + "') ";
+        lb4submit.Text = dv.Count.ToString();
+
+
+        //本月待审核
+        lb4approve.Text = "0";
+        if (lem.CanShenHe || lem.CanYuShen)
+        {
+            lmDt = lpj.Get4ApproveList(lem.GetCanApproveDeptList(), DateTime.Now .Year.ToString(),
+                                                    DateTime.Now .Month.ToString());
+            dv = lmDt.DefaultView;
+            lb4approve.Text = dv.Count.ToString();
+        }
+        if (lem.CanKaoHe)
+        {
+            dv = lpj.GetProjectsByYearMonth(DateTime.Now .Year.ToString(), DateTime.Now .Month.ToString()).DefaultView;
+            dv.RowFilter = "pj_status in('" + ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "') and pd_status <>'"
+                        + ProjectDetailStatus.考核通过 +
+                    "' or pd_status in('" + ProjectDetailStatus.审核通过 + "')";
+
+            lb4approve.Text = (Convert.ToInt32(lb4preapprove.Text) + dv.Count).ToString();
+        }
+
+
+
+        //全年项目
+
+
+        lmDt = lpj.GetProject.GetProjects(lem.GetEmployee.ID, DateTime.Now.Year.ToString() );
+        dv = lmDt.DefaultView;
+        //全年通过数量 
+        dv.RowFilter = "   pj_status in('" +
+                       ProjectStatus.新增审核通过 + "','" + ProjectStatus.项目完成 + "','" + ProjectStatus.删减审核通过 + "')" +
+                       " or pd_status in('" + ProjectDetailStatus.审核通过 + "','" + ProjectDetailStatus.考核通过 + "') ";
+        lbYearPassed .Text = dv.Count.ToString();
+
+        //全年未通过数量
+        dv.RowFilter = " pj_status like '%未通过%'  or pd_status  like '%未通过%'";
+        lbYearFailed.Text = dv.Count.ToString();
+
+
+        //全年得分
+        dv.RowFilter = string.Empty;
+        lmscore = 0;
+        for (int i = 0; i < lmDt.Rows.Count; i++)
+        {
+            lmscore += Convert.ToDouble(lmDt.Rows[i]["pj_score"]);
+        }
+
+        lbYearscore1.Text = lmscore.ToString();
+
+        //全年待提交数量
+        dv.RowFilter = "   pj_status in('" +
+                ProjectStatus.项目已分配 + "','" + ProjectStatus.新增未提交 + "')" +
+                " and pd_status in('" + ProjectDetailStatus.月度未提交 + "') ";
+        lbyear4submit.Text = dv.Count.ToString();
+
+
+    }
+    */
+   /*
+    void bindTrainingInfo()
+    {
+
+        DataTable dt = lem.GetLessons(lem.GetEmployee.ID);
+        DataView dv  = dt.DefaultView;
+        dv.RowFilter = "train_passed=1";
+        lbtpassed.Text = dv.Count.ToString();
+        dv.RowFilter = "train_passed=0 and le_enddate< '" + DateTime.Now.ToShortDateString() +"'";
+        lbtfailed.Text = dv.Count.ToString();
+
+        //总学分
+        decimal allScore = 0;
+
+        for(int i=0;i<dt.Rows.Count;i++)
+        {
+            try
+            {
+                if (dt.Rows[i]["le_xuefen"].ToString() != null)
+                    allScore += Convert.ToDecimal(dt.Rows[0]["le_xuefen"].ToString());
+            }
+            catch (Exception er)
+            {
+                continue;
+            }
+        }
+
+        lbtxuefen.Text = allScore.ToString();
+
+        //取得学分
+        dv.RowFilter = "train_passed=1";
+        decimal passedScore = 0;
+        for (int i = 0; i < dv.Count; i++)
+        {
+            try
+            {
+                if (dv.Table.Rows[i]["le_xuefen"].ToString() != null)
+                    passedScore += Convert.ToDecimal(dv.Table.Rows[0]["le_xuefen"].ToString());
+            }
+            catch (Exception er)
+            {
+                continue;
+            }
+        }
+        lbtxuefenPassed.Text = passedScore.ToString();
+
+
+        //在修课程
+
+        dv.RowFilter = "train_passed=0 and le_enddate > '" + DateTime.Now.ToShortDateString() +"'";
+        lbt4learn.Text = dv.Count.ToString();
+    }
+    */
+    void showOnlineUsers()
+    {
+        lbOnLineUserCnt.Text = "";
+        ArrayList al = lem.OnLineUsers;
+        foreach (string s in al)
+        {
+            lbOnLineUserCnt.Text = lbOnLineUserCnt.Text + s + " <br>  ";
+        }
+    }
+
+    protected void btn_save_Click(object sender, EventArgs e)
+    {
+
+        if(lem.GetEmployee.ValidUser(lem.GetEmployee.em_account, txtOldPasswd.Text)>0)
+        {
+            lem.GetEmployee.em_passwd = Util.Encrypt(txtNewPasswd.Text);
+            lem.GetEmployee.Update();
+        }
+      
+        
+        this.divPasswdChg.Visible = false;
+    }
+    protected void btn_cancel_Click(object sender, EventArgs e)
+    {
+
+        this.divPasswdChg.Visible = false;
+    }
+    protected void lkChgPswd_Click(object sender, EventArgs e)
+    {
+
+        this.divPasswdChg.Visible = !divPasswdChg.Visible;
+    }
+    /*
+    protected void LinkButton1_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton4_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton2_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    protected void LinkButton3_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("~/training/Lessonview.aspx");
+    }
+    */
+    protected void lkbtnusers_Click(object sender, EventArgs e)
+    {
+        divOnlineUsers.Visible = !divOnlineUsers.Visible;
+    }
+}
diff --git a/Dict/.svn/entries b/Dict/.svn/entries
new file mode 100644
index 0000000..b3b1949
--- /dev/null
+++ b/Dict/.svn/entries
@@ -0,0 +1,572 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/Dict
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+DeptMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.289823Z
+16712142e760c3e3ca05f45b4c57db33
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11293
+
+RoleMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.289823Z
+e86a662f72124fe2cc27f337d8ddcdcc
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6333
+
+RoleEmp.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.305448Z
+29348ca6500b98725ee06c066a4239aa
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7294
+
+RoleMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.321073Z
+3c85c792f5bd33b889e2b19cb3f3c7eb
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6742
+
+PublicNewsMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.321073Z
+7eca18f28e1e3addf4103a5718da3b2f
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5727
+
+RoleAuth.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.336698Z
+923c19644561f8abd2223b27bc39ea5d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4914
+
+PublicNewsMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.367949Z
+da6058e5b414376016fd3ff1f92a1d55
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7327
+
+EmployeeMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.352323Z
+b1e9c22e4ad270cf8d85e9e9231bfd66
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+21972
+
+RoleAuth.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.383574Z
+8e3ca1ea83b574b2fa6f2fb11f07e496
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7171
+
+EmployeeMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.383574Z
+6eff2b885c77e15164d857702de2ca53
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+16631
+
+AuthorityMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.399199Z
+ce3967044bd3a42f90be997ca92794fe
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6956
+
+DeptEmp.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.414824Z
+1f9769b3547376f0636c60df6d538452
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3986
+
+DeptMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.430449Z
+615dea6c12eabab33e8b27fccf9398c6
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6799
+
+AuthorityMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.430449Z
+d273d8709e68a9505712a8cfb4feb8c6
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10578
+
+DeptEmp.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.446074Z
+59457379588f33f15f70f8c8c5d61564
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8261
+
+RoleEmp.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.461699Z
+3e2ed1f1a7b9334d307e2b47e7aa6a7e
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5646
+
diff --git a/Dict/.svn/text-base/AuthorityMain.aspx.cs.svn-base b/Dict/.svn/text-base/AuthorityMain.aspx.cs.svn-base
new file mode 100644
index 0000000..9a91587
--- /dev/null
+++ b/Dict/.svn/text-base/AuthorityMain.aspx.cs.svn-base
@@ -0,0 +1,319 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+namespace ajax.Dict
+{
+    public partial class AuthorityMain :PageBase
+    {
+        private LAuthority _logic;
+        protected void Page_Load(object sender, EventArgs e)
+        {
+  
+            if (!IsPostBack)
+            {
+                _logic = new LAuthority();
+                Databound();
+            }
+            SessionSeting();
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+         
+        
+            //װ��ѡ�����Žڵ�IJ�������
+            DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+
+            if (TreeAuth.SelectedNode != null)
+            {
+                TreeAuth.SelectedNode.ChildNodes.Clear();
+                BindTree(TreeAuth.SelectedNode.Value, TreeAuth.SelectedNode, dv);
+          
+            //�����б���ѡ�еIJ����µ����в�������
+            dv.RowFilter = "auth_uplevel = '" + TreeAuth.SelectedValue + "'"; 
+            }
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            UpdateSession();
+            ClearDetail();
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                _logic = (LAuthority)Session[appScope.PagelevelObj]; 
+            }
+        }
+
+        private void UpdateSession()
+        {
+           Session[appScope.PagelevelObj]  = _logic;
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void DetailDataBind()
+        {
+            //������Ϣ��������url������Ϊpublic
+            LAuthority ltmp = new LAuthority();
+            ltmp.Initialize(Convert.ToInt32(TreeAuth.SelectedValue)); 
+            chkPublic.Enabled = !ltmp.GetAuthority.auth_publicInfomation;
+            chkPublicInfo.Enabled = !ltmp.GetAuthority.auth_publicInfomation;
+            chkAlert.Enabled =!chkPublicInfo.Enabled;  //�����Ƶ��ϼ������ǹ�����Ϣ
+            if (chkPublicInfo.Checked) txtLink.Enabled = false;
+           
+            DataDetail.Visible = true;
+            txtName.Text = _logic.GetAuthority.auth_name;
+            txtDesc.Text = _logic.GetAuthority.auth_desc;
+            txtLink.Text = _logic.GetAuthority.auth_link;
+            chkPublic.Checked = _logic.GetAuthority.auth_public;
+            chkPublicInfo.Checked = _logic.GetAuthority.auth_publicInfomation;
+            //�ϼ�Ϊ������Ϣ�����¼�Ҳ������
+           if(ltmp.GetAuthority.auth_publicInfomation) 
+            chkPublicInfo.Checked = ltmp.GetAuthority.auth_publicInfomation;
+        if (ltmp.GetAuthority.auth_public) 
+            chkPublic.Checked = ltmp.GetAuthority.auth_public;
+            chkAlert.Checked = _logic.GetAuthority.auth_marqueen;
+            chkPublic.Checked = _logic.GetAuthority.auth_public;
+             ltmp = null;
+         
+//    chkStatus.Checked = _logic.GetRole.dr;
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            GridView1.SelectedIndex = -1;
+            Databound();
+            DetailDataBind();
+       
+
+
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            DetailDataBind();
+        }
+
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            SetDataBack();
+            //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+            int oper = 0;
+            oper = _logic.GetAuthority.ID > 0 ? _logic.GetAuthority.Update() : _logic.GetAuthority.Add();
+            ClearDetail();
+            Databound();
+            lbEdit.Text = "";
+        }
+
+        protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+            _logic.GetAuthority.Delete();
+            ClearDetail();
+            Databound();
+        }
+
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+    
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+        /***************************************** internal methods ********************************************/
+
+        /// <summary>
+        /// set data from page to shift object
+        /// </summary>
+        private void SetDataBack()
+        {
+            //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+            if (!(_logic.GetAuthority.ID > 0)) 
+            {
+                _logic.GetAuthority.lastmodified = DateTime.Now.ToString();
+                _logic.GetAuthority.auth_uplevel = Convert.ToInt32(TreeAuth.SelectedValue);
+            }
+
+            _logic.GetAuthority.auth_name = txtName.Text;
+            _logic.GetAuthority.auth_desc = txtDesc.Text; 
+            _logic.GetAuthority.auth_link = txtLink.Text;
+            _logic.GetAuthority.auth_public = chkPublic.Checked;
+            _logic.GetAuthority.auth_publicInfomation =chkPublicInfo.Checked  ;
+            _logic.GetAuthority.auth_marqueen =  chkAlert.Checked;
+     
+        }
+
+        private void chgOperTxt(bool addNew)
+        {
+            DataDetail.Visible = true;
+            lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearDetail()
+        {
+            txtName.Text = ""; 
+            txtDesc.Text = "";
+            txtLink.Text ="";
+            chkPublic.Checked = false;
+            chkPublicInfo.Checked = false;
+            DataDetail.Visible = false;
+        }
+
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            DetailDataBind();
+        }
+
+
+
+        public void BindTree(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "'";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node = new TreeNode();
+                node.Text = row["auth_name"].ToString();
+                node.Value = row["pk_authority"].ToString();
+                if (pNode == null)
+                    //˵���Ǹ��ڵ�
+                {
+            
+                    TreeAuth.Nodes.Add(node);
+                    node.Expanded = false;
+      
+                }
+                else
+                {
+                    pNode.ChildNodes.Add(node);
+                    node.Expanded = false;
+                
+                }
+                BindTree(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+   
+        protected void TreeAuth_SelectedNodeChanged1(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+            dv.RowFilter = "auth_uplevel = '" + TreeAuth.SelectedValue + "'";
+            GridView1.DataSource = dv;
+            GridView1.DataBind(); 
+            ClearDetail();
+            if(TreeAuth.SelectedNode.ChildNodes.Count>0)TreeAuth.SelectedNode.Expand();
+        }
+
+        protected void chkPublicInfo_CheckedChanged(object sender, EventArgs e)
+        {
+            switch (chkPublicInfo.Checked)
+            {
+                case true:
+                    txtLink.Text = string.Empty;
+                    txtLink.Enabled = false;
+                    chkPublic.Checked = true;
+                    chkPublic.Enabled = false;
+                    break;
+
+                case false:
+                    txtLink.Text = _logic.GetAuthority.auth_link;
+                    txtLink.Enabled = false;
+                    chkPublic.Checked = false;
+                    chkPublic.Enabled = true;
+                    break;
+
+            }
+        
+        }
+
+
+ ��
+
+        protected void GridView1_RowDataBound1(object sender, GridViewRowEventArgs e)
+        {
+    
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.Text = "";
+                chk.Enabled = false;
+                chk.Checked = e.Row.Cells[4].Text.Trim().Equals("True");
+                e.Row.Cells[4].Controls.Add(chk);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/AuthorityMain.aspx.svn-base b/Dict/.svn/text-base/AuthorityMain.aspx.svn-base
new file mode 100644
index 0000000..8298dde
--- /dev/null
+++ b/Dict/.svn/text-base/AuthorityMain.aspx.svn-base
@@ -0,0 +1,126 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="AuthorityMain.aspx.cs" Inherits="ajax.Dict.AuthorityMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+   
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeAuth" runat="server" ShowLines="True"   ImageSet="Arrows" OnSelectedNodeChanged="TreeAuth_SelectedNodeChanged1">
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+            <Nodes>
+<asp:TreeNode Text="����Ȩ��" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+</Nodes>
+        </asp:TreeView>
+    </td>
+    <td width="1" class="VLine" ></td>
+    <td    width="100%" align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        <asp:Label ID="lbDataGridTitle"  visible="false" runat="server"  CssClass="Label" Text="Ȩ��ά��"  />
+        <asp:Label ID="lbEdit" runat="server"  CssClass="Label" visible="false" Text=""   />
+        <asp:GridView   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False"  
+                        DataKeyNames="PK_AUTHORITY"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                         
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�' OnRowDataBound="GridView1_RowDataBound1">
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+							 
+						 
+            <Columns>
+				<asp:BoundField ReadOnly="True" DataField="PK_AUTHORITY" visible="false" HeaderText="Ȩ��id" SortExpression="PK_DEPARTMENT" ></asp:BoundField>
+				<asp:BoundField DataField="AUTH_NAME" HeaderText="Ȩ������" SortExpression="DEP_NAME" >
+				
+				
+				</asp:BoundField>
+				
+				<asp:BoundField DataField="AUTH_DESC" HeaderText="Ȩ������"  SortExpression="DEP_CODE" ><ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" /></asp:BoundField> 
+				<asp:BoundField DataField="AUTH_LINK" HeaderText="Ȩ������"  SortExpression="AUTH_LINK" ><ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" /></asp:BoundField>
+				<asp:BoundField DataField="AUTH_PUBLIC" HeaderText="����Ȩ��"  SortExpression="AUTH_PUBLIC" ><ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" /></asp:BoundField>
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Wrap="False"   />
+                    <ItemStyle HorizontalAlign="Center" Wrap="False"   />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+             <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder"  width="90%">
+         <tr> 
+            <td     colspan="4" class="ALine">   
+                </td>
+            </tr>
+			<tr><td  nowrap>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="Ȩ������"></asp:Label></td>
+                <td    >
+                 
+					<asp:TextBox ID="txtName" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                    ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+			 <td  nowrap>
+                 <asp:Label ID="Label5" runat="server"  CssClass="Label" Text="Ȩ������"></asp:Label></td><td colspan="2" >
+                <asp:TextBox ID="txtLink"  CssClass="TextBox" runat="server" MaxLength="400" Width="400px"></asp:TextBox>
+                 </td>
+               
+			</tr>
+			<tr>
+			
+                    <td>
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="Ȩ������"></asp:Label></td><td colspan="4">
+                        <asp:TextBox ID="txtDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50" Width="650px"></asp:TextBox></td>
+                    </tr>
+           <tr>
+			
+                    <td>
+                         <asp:Label ID="lbpublic" runat="server"  CssClass="Label" Text="����Ȩ��"></asp:Label></td>
+                         <td >
+                             <asp:CheckBox id="chkPublic" runat="server">
+                             </asp:CheckBox></td>
+                             
+                             <td><asp:Label ID="Label1" runat="server"  CssClass="Label" Text="������Ϣ"></asp:Label></td> 
+                              <td   ><asp:CheckBox id="chkPublicInfo" runat="server" OnCheckedChanged="chkPublicInfo_CheckedChanged" autopostback="true">
+                              </asp:CheckBox>   <asp:CheckBox id="chkAlert" runat="server"    Text="������">
+                              </asp:CheckBox></td>
+                             <td>   &nbsp;</td>
+                    </tr>
+           <tr> 
+            <td     colspan="4" class="ALine">   
+                </td>
+            </tr>
+			<tr> 
+            <td   align="center" colspan="4">  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                
+               
+                </td>
+            </tr>
+            </table>
+            </asp:Panel>
+       </td></tr>
+    
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/DeptEmp.aspx.cs.svn-base b/Dict/.svn/text-base/DeptEmp.aspx.cs.svn-base
new file mode 100644
index 0000000..7301efc
--- /dev/null
+++ b/Dict/.svn/text-base/DeptEmp.aspx.cs.svn-base
@@ -0,0 +1,309 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class DeptEmp : PageBase
+{
+    private LEmployee _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LEmployee();
+             
+            Databound();  
+           
+             //�����ɫʱ��ʼ��������Ա��
+            
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+         bindGV();
+         UpdateSession();
+        bindDept();
+        bindDeptEmp();
+ 
+        
+    }
+
+    /// <summary>
+    /// �󶨲��� 
+    /// </summary>
+    private void bindDept()
+    {
+        TreeDept.Nodes.Clear();
+        BindTree(TreeDept, "0", TreeDept.SelectedNode, _logic.GetDepartments().DefaultView);
+        SetTreeDeptChecked();
+
+    }
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeDeptEmp.Nodes.Clear();
+        BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode, _logic.GetDepartments().DefaultView, _logic.GetActivedEmpDept().DefaultView);
+      
+       
+         
+    }
+
+   
+ 
+    public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["dep_name"] + "</em>" ;
+            node.Value = row["pk_department"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+                empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  , emrow["pk_employee"].ToString()); 
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+
+                tree.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindEmpTree(tree,node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+    public void BindTree(TreeView tree, string id, TreeNode pNode, DataView deptdv )
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<Strong>" + row["dep_name"].ToString() + "</Strong>";
+            node.Value = row["pk_department"].ToString();
+            node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = true;
+            node.Expanded = true;
+           
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                tree.Nodes.Add(node);
+
+
+            }
+            else
+            {
+
+                pNode.ChildNodes.Add(node);
+
+            }
+            BindTree(tree, node.Value, node, new DataView(deptdv.Table));
+
+        }
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LEmployee)Session[appScope.PagelevelObj];   
+        }
+    }
+
+    private void UpdateSession()
+    {
+       Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+ 
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        if (TreeDeptEmp.SelectedNode== null)  return;
+        ArrayList al = new ArrayList();
+
+        GetCheckedNode(TreeDept.Nodes, al);
+        _logic.Initialize();
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                _logic.GetDeptEmp.Delete(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+
+                foreach (string id in al)
+                {
+                    _logic.GetDeptEmp.de_dept = Convert.ToInt32(id);
+                    _logic.GetDeptEmp.de_employee = Convert.ToInt32(TreeDeptEmp.SelectedValue);
+                    _logic.GetDeptEmp.Add();
+                } 
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣������ʧ�ܡ�");
+            }
+
+
+        }
+      
+       
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+       
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+    void SetTreeDeptChecked()
+    {
+       if( TreeDeptEmp.SelectedNode ==null) return;
+        ArrayList deptList = new ArrayList();
+        DataTable dt = _logic.GetDepartments(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+        foreach (DataRow dr in dt.Rows)
+        {
+            deptList.Add(dr["pk_department"]);
+        }
+        SetCheckedNode(TreeDept.Nodes, deptList); 
+    }
+     
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GvDept.SelectedIndex = -1;
+        SetTreeDeptChecked();   
+        bindGV();
+       
+    }
+     
+   
+    void bindGV( )
+    {
+        //��Ա�����嵥
+        string nodevalue = TreeDeptEmp.SelectedValue;
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {     
+      
+          lbEmDept.Text = TreeDeptEmp.SelectedNode.Text + " ��Ա�����嵥";
+          GvDept.DataSource = _logic.GetDepartments(Convert.ToInt32(nodevalue));
+     
+       
+        }
+        GvDept.DataBind();
+       
+    }
+
+    protected void GvDept_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+        if (GvDept.DataKeys != null)
+        {
+            string id = GvDept.DataKeys[e.RowIndex].Value.ToString();
+
+            _logic.GetDeptEmp.ID = Convert.ToInt32(id);
+            _logic.GetDeptEmp.getModel();
+
+            _logic.GetDeptEmp.de_title = ((TextBox)GvDept.Rows[e.RowIndex].Cells[3].Controls[1]).Text;
+           
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetDeptEmp.Update();
+        }
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        GvDept.EditIndex = e.NewEditIndex;
+        GvDept.SelectedIndex = e.NewEditIndex;
+        bindGV();
+    }
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/DeptEmp.aspx.svn-base b/Dict/.svn/text-base/DeptEmp.aspx.svn-base
new file mode 100644
index 0000000..f6c0097
--- /dev/null
+++ b/Dict/.svn/text-base/DeptEmp.aspx.svn-base
@@ -0,0 +1,86 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="DeptEmp.aspx.cs" Inherits="DeptEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table   class="Table_NoBorder" width="100%">
+  
+    <tr><td>
+     <table width="100%" class="Table_NoBorder" border="1">
+     <tr>
+     <td  style="width: 300px" ><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��Ա�б�"  /> </td>
+     <td style="width: 300px"> <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="�����б�"  /></td>
+     <td style="width: 300px" nowrap>
+         ��<asp:Label ID="lbEmDept" runat="server" Font-Bold="True" Text="��Ա�����嵥"  /></td>
+      
+     
+     </tr>
+     <tr>
+     <td valign ="top"><asp:TreeView id="TreeDeptEmp" runat="server"  ShowLines="True" ImageSet="Arrows" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged"   >
+         <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         <nodes>
+<asp:TreeNode Text="������" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+</nodes>
+     </asp:TreeView></td>
+      <td valign ="top"> 
+       
+      
+      <asp:TreeView id="TreeDept" runat="server"  ShowLines="True" ImageSet="Arrows" 
+             ���� ShowCheckBoxes="All" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged"   ><SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+          <nodes>
+<asp:TreeNode Text="������" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+</nodes>
+         </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          &nbsp;<asp:gridview id="GvDept" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              DataKeyNames="pk_deptemp"
+              Width="100%" TabIndex="1" OnRowCancelingEdit="GvDept_RowCancelingEdit" OnRowUpdating="GvDept_RowUpdating" OnRowEditing="GvDept_RowEditing">
+           <columns>
+<asp:BoundField  ReadOnly="True" DataField="pk_deptemp" Visible="False" SortExpression="pk_deptemp" HeaderText="id"></asp:BoundField>
+<asp:BoundField  ReadOnly="True" DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������"></asp:BoundField>
+<asp:BoundField ReadOnly="True" DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������"></asp:BoundField>
+<asp:TemplateField SortExpression="DE_TITLE" HeaderText="ְ��"><EditItemTemplate>
+            <asp:TextBox runat="server" Text='<%# Bind("DE_TITLE") %>' id="TextBox1"></asp:TextBox>
+            
+</EditItemTemplate>
+<ItemTemplate>
+            <asp:Label runat="server" Text='<%# Bind("DE_TITLE") %>' id="Label1"></asp:Label>
+            
+</ItemTemplate>
+</asp:TemplateField>
+<asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif" ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True"></asp:CommandField>
+</columns>
+            
+           <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+           <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+           <alternatingrowstyle cssclass="AlternatingItemStyle" />
+           <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+       </asp:gridview>
+         
+    
+     </tr>
+      
+     
+     </table>
+      
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+             
+                </td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/DeptMain.aspx.cs.svn-base b/Dict/.svn/text-base/DeptMain.aspx.cs.svn-base
new file mode 100644
index 0000000..38fd8a7
--- /dev/null
+++ b/Dict/.svn/text-base/DeptMain.aspx.cs.svn-base
@@ -0,0 +1,361 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class DeptMain : PageBase
+{
+    private LDepartment _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LDepartment();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+        //�󶨲����б�
+        drplstDept.DataSource = _logic.GetAllActiveData();
+        drplstDept.DataTextField = "dep_name";
+        drplstDept.DataValueField = "pk_department";
+        drplstDept.DataBind();
+    
+
+
+
+        drplstDept.Items.Insert(0, (new ListItem("������", "0")));
+        drplstDept.SelectedItem.Selected = false;
+        drplstDept.Items.FindByText("������").Selected = true;
+
+
+
+        //�󶨲�����Ա�б�
+         DropDownList1.DataSource = _logic.GetEmployees();
+        DropDownList1.DataTextField = "em_name";
+        DropDownList1.DataValueField = "pk_employee";
+        DropDownList1.DataBind();
+        DropDownList1.Items.Insert(0,(new ListItem("��ѡ��...","0")));
+        DropDownList1.SelectedItem.Selected = false;
+        DropDownList1.Items.FindByText("��ѡ��...").Selected = true;
+        //װ��ѡ�����Žڵ�IJ�������
+        DataView dv = new DataView(_logic.GetAllActiveData());
+        string selectedValue = TreeDept.SelectedValue;
+         TreeDept.Nodes.Clear();
+        TreeDept.Nodes.Add(new TreeNode("������","0"));
+        TreeDept.Nodes[0].Expanded = true;
+        BindTree("0", TreeDept.Nodes[0], dv);
+     //   TreeDept.SelectedNode.ChildNodes.Clear();
+    //     BindTree(TreeDept.SelectedValue, TreeDept.SelectedNode, dv);
+   //     TreeDept.Nodes.AddAt(0, new TreeNode("������", "0"));
+        if (selectedValue =="0") TreeDept.Nodes[0].Selected = true;
+        else
+        {
+              setTreeDeptSelected(selectedValue, TreeDept.Nodes[0]);
+        }
+      
+        //�����б���ѡ�еIJ����µ����в�������
+        dv.RowFilter = "dep_mastdept = '" + selectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind();
+        UpdateSession();
+    // btnSubmit.Enabled = false;
+      //  ClearDetail();
+
+
+        drplstDept.Items.Clear();
+        initializeDrlstDept(TreeDept.Nodes, drplstDept ,"");
+    }
+
+
+
+    void initializeDrlstDept(TreeNodeCollection nds, DropDownList drplist, string emptyString)
+    {
+        
+       
+        foreach (TreeNode nd in nds)
+        {
+            
+            ListItem li = new ListItem(emptyString + nd.Text,nd.Value);
+            drplist.Items.Add(li); 
+            string NextemptyString = emptyString+ "----";
+            foreach (TreeNode nd1 in nd.ChildNodes)
+            {
+               li = new ListItem(NextemptyString + nd1.Text, nd1.Value);
+                    drplist.Items.Add(li);
+                   
+                if (nd1.ChildNodes.Count > 0)
+                {
+                    NextemptyString +="----";
+                   initializeDrlstDept(nd1.ChildNodes, drplist, NextemptyString);
+                }
+
+
+            }
+        }
+    }
+
+
+
+    void setTreeDeptSelected(string toFind,TreeNode nd)
+    {
+        foreach (TreeNode cnd in nd.ChildNodes)
+        {
+            if (cnd.Value == toFind) 
+            {
+                cnd.Selected = true;
+                break;
+            }
+            else
+            {
+                setTreeDeptSelected(toFind,cnd);
+            }
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LDepartment)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtDepName.Text = _logic.GetDepartment.dep_name ;
+        txtDepcode.Text = _logic.GetDepartment.dep_code;
+        txtDepDesc.Text = _logic.GetDepartment.dep_desc;
+        txtDepType.Text = _logic.GetDepartment.dep_type;
+        DropDownList1.SelectedItem.Selected = false;
+        if(DropDownList1.Items.FindByValue(_logic.GetDepartment.dep_manager.ToString())!=null)
+        {
+          DropDownList1.Items.FindByValue(_logic.GetDepartment.dep_manager.ToString()).Selected = true;  
+        }
+        drplstDept.SelectedItem.Selected = false;
+        if (drplstDept.Items.FindByValue(_logic.GetDepartment.dep_mastdept.ToString()) != null)
+        {
+            drplstDept.Items.FindByValue(_logic.GetDepartment.dep_mastdept.ToString()).Selected = true;
+        }
+         
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+        GridView1.SelectedIndex = -1;
+        Databound();
+        drplstDept.SelectedItem.Selected = false;
+        if (drplstDept.Items.FindByValue(TreeDept.SelectedNode.Value) != null)
+        {
+            drplstDept.Items.FindByValue(TreeDept.SelectedNode.Value).Selected = true;
+        }
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetDepartment.ID > 0 ? _logic.GetDepartment.Update() : _logic.GetDepartment.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetDepartment.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        /*
+        CheckBox chk;
+        if (e.Row.RowType == DataControlRowType.DataRow)
+        {
+            chk = new CheckBox();
+            chk.Text = "����";
+            chk.Enabled = false;
+            chk.Checked = e.Row.Cells[3].Text.Trim().Equals("1");
+            e.Row.Cells[3].Controls.Add(chk);
+        }
+      */
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       if (!(_logic.GetDepartment.ID > 0 )) 
+       {
+          _logic.GetDepartment.lastmodified = DateTime.Now.ToString(); 
+         _logic.GetDepartment.dep_mastdept = Convert.ToInt32(TreeDept.SelectedValue);
+       }
+        
+       _logic.GetDepartment.dr = true;
+       _logic.GetDepartment.dep_name = txtDepName.Text;
+       _logic.GetDepartment.dep_desc = txtDepDesc.Text;
+       _logic.GetDepartment.dep_code = txtDepcode.Text;
+       _logic.GetDepartment.dep_type = txtDepType.Text;
+        if (DropDownList1.SelectedItem != null ) _logic.GetDepartment.dep_manager = Convert.ToInt32(DropDownList1.SelectedValue);
+        if (drplstDept.SelectedItem != null) _logic.GetDepartment.dep_mastdept = Convert.ToInt32(drplstDept.SelectedValue);
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtDepName.Text = "";
+        txtDepcode.Text = "";
+        txtDepDesc.Text = "";
+        txtDepType.Text ="";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+        
+        dv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["dep_name"].ToString();
+            node.Value = row["pk_department"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData()); 
+        dv.RowFilter = "dep_mastdept = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+    }
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/DeptMain.aspx.svn-base b/Dict/.svn/text-base/DeptMain.aspx.svn-base
new file mode 100644
index 0000000..4a58ec3
--- /dev/null
+++ b/Dict/.svn/text-base/DeptMain.aspx.svn-base
@@ -0,0 +1,123 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="DeptMain.aspx.cs" Inherits="DeptMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td width="1" class="VLine" ></td>
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        <asp:Label ID="lbDataGridTitle" Visible="false" runat="server"  CssClass="Label" Text="������"  />
+        <asp:Label ID="lbEdit" Visible="false" runat="server"  CssClass="Label" Text=""></asp:Label>
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        DataKeyNames="pk_department"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="95% " ShowFooter="True" EmptyDataText='û�����ݡ�'>
+						 
+            <Columns>
+<asp:BoundField ReadOnly="True" DataField="PK_DEPARTMENT" Visible="true" SortExpression="PK_DEPARTMENT" HeaderText="���ű��"></asp:BoundField>
+<asp:BoundField DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="DEP_CODE" SortExpression="DEP_CODE" HeaderText="���Ŵ���"></asp:BoundField>
+<asp:BoundField DataField="EM_NAME" SortExpression="DEP_CODE" HeaderText="������"></asp:BoundField>
+<asp:BoundField DataField="DEP_TYPE" SortExpression="DEP_TYPE" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            <emptydatatemplate> û������</emptydatatemplate>
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" /> 
+         
+          <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder" width="90%">
+          <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="��������"></asp:Label></td><td  >
+                 
+					<asp:TextBox ID="txtDepName" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtDepName"
+                    ErrorMessage="*" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+			<td>
+                &nbsp;<asp:Label ID="Label4" runat="server"  CssClass="Label" Text="���Ŵ���"></asp:Label></td><td  >
+					<asp:TextBox ID="txtDepcode" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                </td>
+			</tr>
+			<tr>
+			<td>
+                 <asp:Label ID="Label15" runat="server"  CssClass="Label" Text="�������"></asp:Label></td><td  >
+                <asp:TextBox ID="txtDepType"  CssClass="TextBox" runat="server" MaxLength="25"></asp:TextBox>
+                </td>
+                    <td>
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="��������"></asp:Label></td><td  >
+                        <asp:TextBox ID="txtDepDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50"></asp:TextBox></td>
+                    </tr>
+            <tr>
+		     	<td  >
+                 <asp:Label ID="Label1" runat="server"  CssClass="Label" Text="���Ÿ�����"></asp:Label></td>
+                 <td    >
+                     
+                     <asp:DropDownList ID="DropDownList1" runat="server" CssClass="DropDownList">
+                     </asp:DropDownList></td>
+                   
+                    <td  >
+                 <asp:Label ID="Label5" runat="server"  CssClass="Label" Text="�ϼ�����"></asp:Label></td>
+                 <td    >
+                     
+                     <asp:DropDownList ID="drplstDept" runat="server" CssClass="DropDownList">
+                     </asp:DropDownList></td>
+                    <td />
+               </tr>
+			<tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+              <tr> 
+            <td   align="center"  colspan ="4" >   <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                 </td>
+            </tr>
+            </table>
+            </asp:Panel>
+       </td></tr>
+     
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/EmployeeMain.aspx.cs.svn-base b/Dict/.svn/text-base/EmployeeMain.aspx.cs.svn-base
new file mode 100644
index 0000000..08fea1e
--- /dev/null
+++ b/Dict/.svn/text-base/EmployeeMain.aspx.cs.svn-base
@@ -0,0 +1,533 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using view.App_Code;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class EmployeeMain : PageBase
+{
+    private LEmployee _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            
+            _logic = new LEmployee();
+            bindDeptTree();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    void bindDeptTree()
+    {
+    
+        DataView dvDept = new DataView(_logic.GetDepartments());
+      
+        //װ��ѡ�����Žڵ�IJ�������
+
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+    }
+
+
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+       
+        //�󶨲�����ѡ�еIJ����µ�����Ա������
+        bindGrid();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LEmployee)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtAccount.ReadOnly = true;
+        txtName.Text = _logic.GetEmployee.em_name;
+        txtBirthday.Text = _logic.GetEmployee.em_birthday.ToString();
+        txtCell.Text = _logic.GetEmployee.em_cellnum;
+        txtDateParty.Text = _logic.GetEmployee.em_date_in_party.ToString();
+        txtID.Text = _logic.GetEmployee.em_idnum;
+        txtMail.Text = _logic.GetEmployee.em_email;
+       //txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtAccount.Text = _logic.GetEmployee.em_account;
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+        drplstSex.Items.FindByValue("1").Selected = true;
+
+        if (_logic.GetEmployee.em_sex)
+        {
+            drplstSex.Items.FindByValue("0").Selected = false;
+            drplstSex.Items.FindByValue("1").Selected = true;
+        }
+        else
+        {  
+            drplstSex.Items.FindByValue("1").Selected = false;
+            drplstSex.Items.FindByValue("0").Selected = true;
+        }
+        if (drplstEducation.Items.FindByValue(_logic.GetEmployee.em_education) != null)
+ //            drplstEducation.Items.FindByValue(_logic.GetEmployee.em_education).Selected=true;   //ListItemColleciton can only select one item, if another has been selected, this will case error.
+            SetDropDownlistSelection(drplstEducation, _logic.GetEmployee.em_education);
+
+        bindGV();
+
+         if (drlstPlitics.Items.FindByValue(_logic.GetEmployee.em_politic) != null)
+             //drlstPlitics.Items.FindByValue(_logic.GetEmployee.em_politic).Selected = true;
+             SetDropDownlistSelection(drlstPlitics, _logic.GetEmployee.em_politic);
+
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+
+    void bindGV()
+    { 
+            GvDept.DataSource = _logic.GetDepartments(_logic.GetEmployee.ID); 
+            GvDept.DataBind();
+
+    }
+
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+         if(TreeDept.SelectedValue == "0" )
+         {
+             ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+                                               "alert('��ѡ���û��������š�');", true);
+             return;
+         }
+        txtAccount.ReadOnly = false;
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+        GridView1.SelectedIndex = -1;
+        Databound();
+        txtTitle.Enabled = true;
+        lbTitle.Visible = true;
+        txtTitle.Visible = true;
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+     //   DetailDataBind();
+        DataDetail.Visible = true;
+        bindGV();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+
+        bool userNotExist = true;
+        SetDataBack();
+        if (txtName.Text.Trim().Length == 0)
+        {
+            txtName.Focus();
+             bindGrid();
+       //  ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+       //                                        "alert('�������û�������');", true);
+            return;
+        
+        }
+        if (txtAccount.Text.Trim().Length == 0)
+        {
+            txtAccount.Focus();
+            bindGrid();
+       //     ScriptManager.RegisterStartupScript(btnSubmit, typeof (UpdatePanel), "alert",
+       //                                         "alert('�������û��˺š�');", true);
+            return;
+        }
+
+
+
+
+        /*
+         if(lem.GetEmployee.em_account !="mysec" )
+         if (_logic != null)
+             if (_logic.GetEmployee != null)
+                 if(_logic.GetEmployee.QueryActived().Tables[0].Rows.Count>20)
+                     return;
+         */
+
+        if (_logic != null)
+            if (_logic.GetEmployee != null)
+                if (_logic.GetEmployee.ID > 0)
+                    _logic.GetEmployee.Update();
+                else
+                {
+                    userNotExist = _logic.AddEmployee();
+
+                   
+                }
+        if (!userNotExist)
+        {
+            ScriptManager.RegisterStartupScript(btnSubmit, typeof (UpdatePanel), "alert",
+                                                "alert('�û���   " + txtAccount.Text
+                                                + "  �Ѿ����ڣ����������룬����ʧ�ܡ�');", true);
+
+            bindGrid();
+
+            txtAccount.Text ="";
+            txtAccount.Focus();
+        }
+        else
+        {
+            ClearDetail();
+            Databound();
+            DataDetail.Visible = false;
+        }
+ 
+    }
+    void bindGrid()
+    {
+        _logic.GetEmployee.em_dept = TreeDept.SelectedValue;
+            DataView dv = TreeDept.SelectedValue != "0" ? new DataView(_logic.GetActiveEmpByDept(Convert.ToInt32(TreeDept.SelectedValue))) : new DataView(_logic.GetActivedEmpDept());
+            dv.RowFilter = "em_name <>'Root'";
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+
+    }
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+     
+        _logic.GetEmployee.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        Label lb;
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                lb = new Label();
+                lb.Text = e.Row.Cells[3].Text.Trim().Equals("True") ? "��" : "Ů";
+                e.Row.Cells[3].Controls.Add(lb);
+                break;
+        }
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       if ( _logic.GetEmployee.ID >0 ) 
+       { 
+           _logic.GetEmployee.lastmodified = DateTime.Now.ToString(); 
+
+           if(txtPasswd.Text.Trim().Length>0)
+               _logic.GetEmployee.em_passwd = PublicUtils.Encrypt(txtPasswd.Text.Trim());
+       }
+       else
+       {
+                _logic.GetEmployee.em_passwd = PublicUtils.Encrypt(txtPasswd.Text.Trim());
+       }
+      
+
+        
+       _logic.GetEmployee.dr = true;
+       _logic.GetEmployee.em_name = txtName.Text;
+       _logic.GetEmployee.em_account = txtAccount.Text;
+       _logic.GetEmployee.em_birthday = txtBirthday.Text;  
+       _logic.GetEmployee.em_cellnum = txtCell.Text;
+       _logic.GetEmployee.em_date_in_party =  txtDateParty.Text;
+        _logic.GetEmployee.em_date_work = txtworkdate.Text;
+        _logic.GetEmployee.em_education = drplstEducation.SelectedValue;
+       _logic.GetEmployee.em_email = txtMail.Text;  
+       _logic.GetEmployee.em_idnum = txtID.Text;  
+     
+        _logic.GetEmployee.em_politic = drlstPlitics.SelectedValue;
+        _logic.GetEmployee.em_sex = drplstSex.SelectedIndex == 0;
+       
+       
+        _logic.GetEmployee.em_dept = TreeDept.SelectedValue;
+        _logic.GetEmployee.em_jobcode = txtTitle.Text;
+
+
+
+       
+
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        lbEdit.Text = "";
+        txtworkdate.Text = ""; 
+        txtName.Text = "" ;
+        txtBirthday.Text = "";
+        txtCell.Text = "";
+        txtDateParty.Text = "";
+        txtID.Text = "";
+        txtMail.Text ="";
+        txtPasswd.Text ="";
+        txtAccount.Text ="";
+        txtTitle.Text = "";
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+        txtPasswd.Text = "";
+        InitDropdownlist();
+        //װ��ѡ�����Žڵ�IJ�������
+      //  drlstPlitics.SelectedIndex = -1;
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        lbTitle.Visible = false;
+        txtTitle.Visible = false;
+        Databound();
+        DetailDataBind();
+        txtTitle.Enabled = false;
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+        
+        dv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["dep_name"].ToString();
+            node.Value = row["pk_department"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        /*
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")  
+             dv.RowFilter = "em_dept = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        */
+        if (_logic != null) _logic.Initialize();
+        GridView1.SelectedIndex = -1;
+        Databound();
+
+        
+    }
+    protected void drplstSex_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        ListItem selectedItem = drplstSex.Items[1];
+        selectedItem.Selected = true;
+    }
+
+    protected void InitDropdownlist()
+    {
+      
+        drplstSex.Items[ drplstSex.SelectedIndex].Selected = false;
+        drplstSex.Items.FindByValue("1").Selected = true;
+
+        drlstPlitics.Items[drlstPlitics.SelectedIndex].Selected = false;
+        drlstPlitics.Items[0].Selected = true;  
+         
+    }
+
+    protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+    {
+        drdlst.Items[drdlst.SelectedIndex].Selected = false;
+        if (drdlst.Items.FindByValue(value)!=null)
+            drdlst.Items.FindByValue(value).Selected = true;
+    }
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    { 
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[11].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "������ϵͳ�û��б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[11].Visible = true;
+        Databound();   
+        
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+         
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+
+    
+    protected void GvDept_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+        if (GvDept.DataKeys != null)
+        {
+            string id = GvDept.DataKeys[e.RowIndex].Value.ToString();
+
+            _logic.GetDeptEmp.ID = Convert.ToInt32(id);
+            _logic.GetDeptEmp.getModel();
+
+            _logic.GetDeptEmp.de_title = ((TextBox)GvDept.Rows[e.RowIndex].Cells[3].Controls[1]).Text;
+
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetDeptEmp.Update();
+        }
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        GvDept.EditIndex = e.NewEditIndex;
+        GvDept.SelectedIndex = e.NewEditIndex;
+        bindGV();
+    }
+    
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/EmployeeMain.aspx.svn-base b/Dict/.svn/text-base/EmployeeMain.aspx.svn-base
new file mode 100644
index 0000000..9ae1d49
--- /dev/null
+++ b/Dict/.svn/text-base/EmployeeMain.aspx.svn-base
@@ -0,0 +1,297 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master"  
+    AutoEventWireup="true" CodeFile="EmployeeMain.aspx.cs" Inherits="EmployeeMain" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td> 
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td width="50" height="200" align="left" valign="top">
+                            <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged"
+                                ImageSet="Arrows">
+                                <nodes>
+                <asp:TreeNode Text="������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </nodes>
+                                <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                            </asp:TreeView>
+                            <asp:TextBox id="TextBox11" runat="server" visible=false>
+    </asp:TextBox>
+     
+    <cc1:calendarextender id="CalendarExtender11" runat="server" targetcontrolid="TextBox11"></cc1:calendarextender>
+    
+                        </td>
+                        <td width="1" class="VLine">
+                        </td>
+                        <td align="left" valign="top" width="90%">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:Label ID="lbDataGridTitle" Visible="false" runat="server" CssClass="Label" Text="��Աά��" />
+                            <asp:Label ID="lbEdit" Visible="false" runat="server" CssClass="Label" Text=""></asp:Label>
+                            <asp:gridview id="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" OnRowEditing="GridView1_RowEditing"
+                                DataKeyNames="pk_employee" OnRowDeleting="GridView1_RowDeleting" AllowPaging="True"
+                                OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                <columns>
+				<asp:BoundField  Visible="TRUE"  ReadOnly="True" DataField="PK_EMPLOYEE" HeaderText="��Ա���" SortExpression="PK_EMPLOYEE" ></asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="����" SortExpression="EM_NAME">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                	<asp:BoundField DataField="DEP_NAME" HeaderText="����" SortExpression="DEP_NAME" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_SEX" HeaderText="�Ա�" SortExpression="EM_SEX" HtmlEncode="False"   DataFormatString="{0:True:��;False:Ů}">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_BIRTHDAY" HeaderText="��������" SortExpression="EM_BIRTHDAY"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="de_title" HeaderText="ְ��" SortExpression="de_title">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="em_education" HeaderText="ѧ��" SortExpression="em_education">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="em_politic" HeaderText="��Ա����" SortExpression="em_politic">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="em_date_in_party" HeaderText="�뵳ʱ��" SortExpression="em_date_in_party" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="em_date_work" HeaderText="�μӹ���ʱ��" SortExpression="em_date_work"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</columns>
+                                <pagerstyle horizontalalign="Right" />
+                                <emptydatatemplate> û������</emptydatatemplate>
+                            </asp:gridview>
+                            <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+                            
+                             <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                <!------ THE ADD /DELETE AREA ------>
+                                <table class="Table_NoBorder" border="0" width="95%">
+                                 <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                        </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label2" runat="server" CssClass="Label" Text='����'></asp:Label></td>
+                                        <td nowrap>
+                                            <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25">
+                                            </asp:TextBox>
+                                            <asp:RequiredFieldValidator id="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                                                ErrorMessage="�������û�����" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                        <td>
+                                            <asp:Label ID="Label4" runat="server" CssClass="Label" Text='�Ա�'></asp:Label></td>
+                                        <td>
+                                            <asp:DropDownList ID="drplstSex" runat="server" CssClass="DropDownList">
+                                                <asp:ListItem Value="1">��</asp:ListItem>
+                                                <asp:ListItem Value="0">Ů</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                        <td nowrap>
+                                            ��������</td>
+                                        <td>
+                                            <asp:TextBox ID="txtBirthday" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox>
+                                           
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="����֤��"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtID" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox>
+                                        </td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��Ա����"></asp:Label></td>
+                                        <td>
+                                            <asp:DropDownList ID="drlstPlitics" runat="server" CssClass="DropDownList">
+                                                <asp:ListItem>�޵���</asp:ListItem>
+                                                <asp:ListItem>�й���Ա</asp:ListItem>
+                                                <asp:ListItem>������Ա</asp:ListItem>
+                                                <asp:ListItem>��������</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                        <td nowrap>
+                                            <asp:Label ID="lbPartytime" runat="server" CssClass="Label" Text="�뵳ʱ��" /></td>
+                                        <td>
+                                            <asp:TextBox ID="txtDateParty" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox></td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label10" runat="server" CssClass="Label" Text="��������"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtMail" CssClass="TextBox" runat="server" MaxLength="25" CausesValidation="True"></asp:TextBox>
+                                            <asp:RegularExpressionValidator id="RegularExpressionValidator1" runat="server" ControlToValidate="txtMail"
+                                                ErrorMessage="���������ʽ����ȷ����ȷ��ʽ��zhangsan@163.net��" ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*"
+                                                ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator>&nbsp;
+                                        </td>
+                                        <td>
+                                            <asp:Label ID="Label5" runat="server" CssClass="Label" Text="�μӹ���ʱ��"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtworkdate" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox></td>
+                                        <td>
+                                            ѧ��</td>
+                                        <td>
+                                            <asp:DropDownList ID="drplstEducation" CssClass="DropDownList" runat="server">
+                                                <asp:ListItem>��ʿ</asp:ListItem>
+                                                <asp:ListItem>˶ʿ�о���</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>ר��</asp:ListItem>
+                                                <asp:ListItem>��ר</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>Сѧ</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                    </tr>
+                                    <tr>
+                                        <td nowrap>
+                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="�˺�"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtAccount" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox>
+                                            <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtAccount"
+                                                ErrorMessage="�������˺š�" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label8" runat="server" CssClass="Label" Text="����"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtPasswd" CssClass="TextBox" runat="server" MaxLength="25" TextMode="Password">
+                                            </asp:TextBox></td>
+                                        <td>
+                                            <asp:Label ID="Label9" runat="server" CssClass="Label" Text="�ֻ�"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtCell" CssClass="TextBox" runat="server" MaxLength="25" CausesValidation="True"></asp:TextBox>
+                                            <asp:RegularExpressionValidator id="RegularExpressionValidator2" runat="server" ControlToValidate="txtCell"
+                                                Display="Dynamic" ErrorMessage="�ֻ������ʽ����ȷ��ӦΪ11λ���֡�" ValidationExpression="^\d{11}$" ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator></td>
+                                    </tr>
+                                    <tr>
+                                        <td nowrap>
+                                            <asp:Label ID="lableDept" runat="server" CssClass="Label" Text="��ǰ����"></asp:Label></td>
+                                        <td>
+                                            <asp:Label ID="lbSelectedDept" runat="server" CssClass="Label" Text="" /></td>
+                                        <td nowrap>
+                                            <asp:Label ID="lbTitle" runat="server" CssClass="Label" Text="ְ��"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtTitle" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox></td>
+                                        <td>
+                                        </td>
+                                        <td>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="lbempdept" runat="server" CssClass="Label" Text="���ŷ���"></asp:Label></td>
+                                        <td colspan="4" align="center">
+                                            <asp:gridview id="GvDept" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                                DataKeyNames="pk_deptemp" emptydatatext="û�����ݡ�" ShowFooter="True" tabIndex="1"
+                                                Width="100%" OnRowCancelingEdit="GvDept_RowCancelingEdit" OnRowUpdating="GvDept_RowUpdating"
+                                                OnRowEditing="GvDept_RowEditing">
+                                                <columns>
+                        <asp:BoundField  ReadOnly="True" DataField="pk_deptemp" Visible="False" SortExpression="pk_deptemp" HeaderText="id"></asp:BoundField>
+                        <asp:BoundField  ReadOnly="True" DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������"></asp:BoundField>
+                        <asp:BoundField ReadOnly="True" DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������"></asp:BoundField>
+                      <asp:TemplateField SortExpression="DE_TITLE" HeaderText="ְ��"><EditItemTemplate>
+                   <asp:TextBox runat="server" Text='<%# Bind("DE_TITLE") %>' id="TextBox1"></asp:TextBox>
+            
+                    </EditItemTemplate>
+                    <ItemTemplate>
+                                <asp:Label runat="server" Text='<%# Bind("DE_TITLE") %>' id="Label1"></asp:Label>
+                                
+                    </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif" ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True"></asp:CommandField>
+                    </columns>
+                                                <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+                                                <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+                                                <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                                                <selectedrowstyle cssclass="SelectedItemStyle" />
+                                            </asp:gridview>
+                                            </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                        </td>
+                                        <td>
+                                            <cc1:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="txtBirthday"
+                                                FirstDayOfWeek="Monday" CssClass="MyCalendar">
+                                            </cc1:CalendarExtender>
+                                        </td>
+                                        <td>
+                                            <cc1:CalendarExtender ID="CalendarExtender2" runat="server" TargetControlID="txtworkdate"
+                                                FirstDayOfWeek="Monday" CssClass="MyCalendar">
+                                            </cc1:CalendarExtender>
+                                        </td>
+                                        <td>
+                                            <cc1:CalendarExtender ID="CalendarExtender3" runat="server" TargetControlID="txtDateParty"
+                                                FirstDayOfWeek="Monday" CssClass="MyCalendar">
+                                            </cc1:CalendarExtender>
+                                        </td>
+                                        <td>
+                                        </td>
+                                        <td>
+                                        </td>
+                                    </tr>
+                                     <tr>
+                                        <td colspan="6"  >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                    <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                        </tr>
+                    <tr>
+                        <td colspan="6" align="center">
+                            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="����" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                            <!--input type="button" id="ButtonCancel" onClick="reset()"  class="Button"	value="ȡ���޸�" name="ButtonCancel"/-->
+                        </td>
+                    </tr>
+                </table>
+                         </asp:Panel>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center" style="height: 309px" valign="top">
+                            <!------ THE ADD /DELETE AREA ------>
+                         
+                    </td>
+                 </tr>
+             </table>
+    </td>
+    </tr> 
+    </table>
+</asp:Content>
diff --git a/Dict/.svn/text-base/PublicNewsMain.aspx.cs.svn-base b/Dict/.svn/text-base/PublicNewsMain.aspx.cs.svn-base
new file mode 100644
index 0000000..34dc58d
--- /dev/null
+++ b/Dict/.svn/text-base/PublicNewsMain.aspx.cs.svn-base
@@ -0,0 +1,266 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Tracen.Utils;
+using ZhangPu.Gov.Logical;
+
+public partial class PublicNewsMain : PageBase
+{
+    private LPublicNews _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LPublicNews();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+         
+        
+        //װ��ѡ���ڵ������
+        DataView dv = new DataView(_logic.QueryPublicInfomation());
+        
+        TreeAuth.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeAuth.SelectedNode.Value, TreeAuth.SelectedNode, dv);
+        //�����б���ѡ�е���������
+        
+        GridView1.DataSource = _logic.QueryNews(Convert.ToInt32(TreeAuth.SelectedValue));
+        GridView1.DataBind();
+
+       //  GVFiles.DataSource = null;
+       // GVFiles.DataBind();
+        UpdateSession();
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LPublicNews)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+
+        DataDetail.Visible = true;
+        txtTitle.Text = _logic.GetPublicNews.news_title;
+        txtDesc.Text = _logic.GetPublicNews.news_content; 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+      
+        GridView1.SelectedIndex = -1;
+        Databound();
+        DetailDataBind();
+       //todo bind attached files infomationsss\\
+
+
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetPublicNews.ID > 0 ? _logic.GetPublicNews.Update() : _logic.GetPublicNews.Add();
+        ClearDetail();
+        Databound();
+        lbEdit.Text = "";
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetPublicNews.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+        if (!(_logic.GetPublicNews.ID > 0)) 
+       {
+           _logic.GetPublicNews.last_modified  = DateTime.Now.ToString();
+           _logic.GetPublicNews.news_authority = Convert.ToInt32(TreeAuth.SelectedValue);
+       }
+
+       _logic.GetPublicNews.news_title = txtTitle.Text;
+       _logic.GetPublicNews.news_content = txtDesc.Text; 
+       
+        //todo bind files
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtTitle.Text = ""; 
+        txtDesc.Text = "";
+       
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+        dv.RowFilter = "auth_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["auth_name"].ToString();
+            node.Value = row["pk_authority"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeAuth.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+   
+    protected void TreeAuth_SelectedNodeChanged1(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.QueryNews(Convert.ToInt32(TreeAuth.SelectedValue))); 
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+    }
+
+
+
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+
+         
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                if (e.Row.Cells[2].Text.Trim().Length > 30) e.Row.Cells[2].Text = e.Row.Cells[2].Text.Substring(0,30)+"....";
+                
+                break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/PublicNewsMain.aspx.svn-base b/Dict/.svn/text-base/PublicNewsMain.aspx.svn-base
new file mode 100644
index 0000000..5a53297
--- /dev/null
+++ b/Dict/.svn/text-base/PublicNewsMain.aspx.svn-base
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="PublicNewsMain.aspx.cs" Inherits="PublicNewsMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+   
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeAuth" runat="server" ShowLines="True"   ImageSet="Arrows" OnSelectedNodeChanged="TreeAuth_SelectedNodeChanged1">
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+            <Nodes>
+<asp:TreeNode Text="������Ϣ����" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+</Nodes>
+        </asp:TreeView>
+    </td>
+    <td width="1" class="VLine" ></td>
+    <td    width="100%" align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        <asp:Label ID="lbDataGridTitle" Visible="false" runat="server"  CssClass="Label" Text="��Ϣά��"  />
+        <asp:Label ID="lbEdit" Visible="false" runat="server"  CssClass="Label" Text=""></asp:Label>
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False"  
+                        DataKeyNames="PK_NEWS"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                         
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�' OnRowDataBound="GridView1_RowDataBound">
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" ></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField ReadOnly="True" DataField="PK_NEWS" visible="false" HeaderText="Ȩ��id" SortExpression="PK_DEPARTMENT" ></asp:BoundField>
+				<asp:BoundField DataField="news_title" HeaderText="��Ϣ����" SortExpression="news_title" ></asp:BoundField>
+				<asp:BoundField DataField="news_content" HeaderText="��Ϣ����" SortExpression="news_content" ></asp:BoundField> 
+			    <asp:BoundField DataField="create_time" HeaderText="����ʱ��" SortExpression="create_time" ></asp:BoundField> 
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="15%" />
+                    <ItemStyle HorizontalAlign="Center" Width="15%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       
+       
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder"  width="100%">
+         <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td  nowrap>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="����"></asp:Label></td>
+                <td    >
+                 
+					<asp:TextBox ID="txtTitle" runat="server"  CssClass="TextBox" MaxLength="100" width="400px"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtTitle"
+                    ErrorMessage="*" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+			 
+               
+			</tr>
+			<tr>
+			
+                    <td style="height: 218px">
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="����"></asp:Label></td><td style="height: 218px"  >
+                        <asp:TextBox ID="txtDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50" Width="803px" Height="300px" TextMode="MultiLine"></asp:TextBox></td>
+                    </tr>
+                
+			  <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+            </table>
+           
+              <!------ BUTTONS ------>
+            <table class="Table_NoBorder" width="80%"> 
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                
+                </td>
+            </tr>
+          </table>      
+       </asp:Panel>
+       
+       </td></tr>
+    
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/RoleAuth.aspx.cs.svn-base b/Dict/.svn/text-base/RoleAuth.aspx.cs.svn-base
new file mode 100644
index 0000000..3332cd7
--- /dev/null
+++ b/Dict/.svn/text-base/RoleAuth.aspx.cs.svn-base
@@ -0,0 +1,279 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class RoleAuth : PageBase
+{
+    private LRoleAuthority _logic;
+   
+    protected void Page_Load(object sender, EventArgs e)
+    {
+       
+       
+        if (!IsPostBack)
+        {
+            _logic = new LRoleAuthority();
+            Databound(); 
+            bindAuth();
+            bindRoles();
+           
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+
+         bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    /// <summary>
+    /// ��Ȩ��
+    /// </summary>
+    void bindAuth()
+    {
+        treeAuth.Nodes.Clear(); 
+        BindAuthTree("0", treeAuth.SelectedNode, _logic.QueryNonePublicAuthority().DefaultView);
+    }
+
+ 
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindRoles()
+    {
+        DataView dv = _logic.GetAllRoles().DefaultView;
+        dv.RowFilter = "role_4Approve =0";
+        listRoles.DataSource =dv;
+        listRoles.DataTextField = "role_name";
+        listRoles.DataValueField = "pk_role";
+        listRoles.DataBind();
+    }
+ 
+   
+
+    public void BindAuthTree(string id, TreeNode pNode, DataView  dv )
+    {
+
+        dv.RowFilter = "auth_uplevel = '" + id + "'";
+        foreach (DataRowView row in  dv)
+        {
+            TreeNode node = new TreeNode();
+            string authLink = row["auth_link"].ToString();
+            node.Value = row["pk_authority"].ToString();
+            node.Expanded = true;
+            if (authLink == string.Empty || authLink.Trim().Length < 6) //not *.aspx
+            {
+                node.Text = "<strong>" + row["auth_name"] + "</strong>"; 
+                node.SelectAction = TreeNodeSelectAction.None;
+                node.ShowCheckBox = false;
+            }   else 
+ 
+            {
+                node.Text =   row["auth_name"].ToString()  ;
+            }
+           
+          
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                treeAuth.Nodes.Add(node);
+              
+
+            }
+            else
+            {
+                
+                pNode.ChildNodes.Add(node);
+ 
+            }
+            BindAuthTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRoleAuthority)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+ 
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        if (listRoles.SelectedValue == string.Empty) return;
+        //��ɫ��Ȩ��
+        ArrayList al = new ArrayList();
+        GetCheckedNode(treeAuth.Nodes, al);
+        _logic.Initialize();
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                
+                _logic.GetRoleAuthority.Delete(Convert.ToInt32(listRoles.SelectedValue));
+                //   _logic.Initialize();
+                foreach (string id in al)
+                {
+                    _logic.GetRoleAuthority.ra_role = Convert.ToInt32(listRoles.SelectedValue);
+                    _logic.GetRoleAuthority.ra_authority = Convert.ToInt32(id);
+                    _logic.GetRoleAuthority.Add();
+                }
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣������ʧ�ܡ�");
+            }
+
+
+        }
+
+
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    { 
+       
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+       
+        btnSubmit.Enabled = true;
+        
+    }
+
+    private void ClearDetail()
+    { 
+       
+    }
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+      
+      
+ /*
+        if (treeAuth.SelectedNode != null) treeAuth.SelectedNode.Selected = false;
+        lbAuthRole.Text = "Ȩ�޽�ɫ�嵥" ;
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+  */
+  
+  //--����Ȩ������ѡ��
+            ArrayList autList = new ArrayList();
+            DataView dv = _logic.GetRoleAuthority.QueryActived().Tables[0].DefaultView;
+            dv.RowFilter = "ra_role ='" + listRoles.SelectedValue + "'";
+            foreach (DataRowView drv in dv)
+            {
+                autList.Add(drv["ra_authority"]);
+            }
+            SetCheckedNode(treeAuth.Nodes, autList);
+
+       bindGV();
+
+    }
+   
+     
+    protected void treeAuth_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        bindGV();
+            
+    }
+
+    void bindGV()
+    { 
+        //��ɫ��Ӧ����Ա�嵥
+        if (listRoles.SelectedItem != null)
+        {
+
+            lbRoleEm.Text = listRoles.SelectedItem.Text + " ��ɫ��Ա�嵥";
+            GvEm.DataSource = _logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue));
+        }
+        GvEm.DataBind();
+         
+      
+        //Ȩ�޶�Ӧ�Ľ�ɫ,��Ա�嵥
+        if (treeAuth.SelectedNode != null) 
+        { 
+            lbAuthEm.Text = treeAuth.SelectedNode.Text + " Ȩ����Ա�嵥";
+            GvAuthEm.DataSource = _logic.GetEmListByAuth(Convert.ToInt32(treeAuth.SelectedValue));
+            lbAuthRole.Text =   treeAuth.SelectedNode.Text + " Ȩ�޽�ɫ�嵥";
+            GvRole.DataSource = _logic.GetRoleListByAuth(Convert.ToInt32(treeAuth.SelectedValue));
+            
+        }
+        GvAuthEm.DataBind();
+        GvRole.DataBind();
+    }
+ 
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/RoleAuth.aspx.svn-base b/Dict/.svn/text-base/RoleAuth.aspx.svn-base
new file mode 100644
index 0000000..eae8516
--- /dev/null
+++ b/Dict/.svn/text-base/RoleAuth.aspx.svn-base
@@ -0,0 +1,117 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleAuth.aspx.cs" Inherits="RoleAuth" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+     
+    <tr><td>
+     <table width="100%" class="Table_NoBorder" border="1">
+     <tr class="HeaderStyle">
+     <td style="width: 120px"><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��ɫ�б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbAuth" runat="server" Font-Bold="True" Text="Ȩ���б�"  /></td>
+     <td style="width: 200px" nowrap>
+         <asp:Label ID="lbAuthRole" runat="server" Font-Bold="True" Text="��ɫ�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+           <asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text="��Ա�嵥"  /></td> 
+      <td style="width: 200px" nowrap><asp:Label ID="lbAuthEm" runat="server" Font-Bold="True" Text="��Ա�嵥"  /></td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top" >
+       <asp:ListBox id="listRoles" runat="server" width="120px" Height="360px" OnSelectedIndexChanged="listRoles_SelectedIndexChanged"  AutoPostBack="True">
+         </asp:ListBox></td>
+      <td valign ="top">
+      
+     
+     <asp:TreeView ID="treeAuth" runat="server" ShowLines="True"   ImageSet="Arrows" OnSelectedNodeChanged="treeAuth_SelectedNodeChanged" ShowCheckBoxes="All"  >
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+            <Nodes>
+<asp:TreeNode Text="" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+</Nodes>
+        </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          
+          <asp:gridview id="GvRole" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����"></asp:BoundField>
+                <asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����"></asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top">
+           
+           <asp:gridview id="GvEm" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+               <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField>
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+           
+                </columns>
+               <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+               <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+               <alternatingrowstyle cssclass="AlternatingItemStyle" />
+           </asp:gridview>
+         
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvAuthEm" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField>
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview></td>
+     </tr>
+     
+     
+     
+     </table>
+     
+     
+     
+     
+     
+     
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                
+               </td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/RoleEmp.aspx.cs.svn-base b/Dict/.svn/text-base/RoleEmp.aspx.cs.svn-base
new file mode 100644
index 0000000..6343f83
--- /dev/null
+++ b/Dict/.svn/text-base/RoleEmp.aspx.cs.svn-base
@@ -0,0 +1,277 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class RoleEmp : PageBase
+{
+    private LRoleAuthority _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LRoleAuthority();
+            Databound();  
+            bindRoles();
+            bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+    //    if (!isRoleAuth) bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeDeptEmp.Nodes.Clear();
+        BindTree("0", TreeDeptEmp.SelectedNode, new LEmployee().GetDepartments().DefaultView, new  LEmployee().GetActivedEmpDept().DefaultView);
+         
+         
+    }
+
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindRoles()
+    {
+   
+        listRoles.DataSource = _logic.GetAllRoles();
+        listRoles.DataTextField = "role_name";
+        listRoles.DataValueField = "pk_role";
+        listRoles.DataBind();
+    }
+ 
+    public void BindTree(string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["dep_name"] + "</em>" + row["pk_department"];
+            node.Value = row["pk_department"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+            empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  , emrow["pk_employee"].ToString()); 
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDeptEmp.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+ 
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRoleAuthority)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+ 
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        if (listRoles.SelectedValue == string.Empty) return;
+        ArrayList al = new ArrayList();
+
+        GetCheckedNode(TreeDeptEmp.Nodes, al);
+        _logic.Initialize();
+ //       using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                
+                _logic.GetRoleEmp.Delete(Convert.ToInt32(listRoles.SelectedValue));
+
+                foreach (string id in al)
+                {
+                    _logic.GetRoleEmp.re_role = Convert.ToInt32(listRoles.SelectedValue);
+                    _logic.GetRoleEmp.re_employee = Convert.ToInt32(id);
+                    _logic.GetRoleEmp.Add();
+                } 
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣������ʧ�ܡ�");
+            }
+
+
+        }
+
+       
+
+     
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+       
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+
+    
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+       
+      
+        //--������Ա����ѡ��
+       /*
+        if (TreeDeptEmp.SelectedNode != null) TreeDeptEmp.SelectedNode.Selected = false;
+         
+        lbAuthRole.Text = "��Ա��ɫ�嵥";
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+        * */
+        //--ѡ����Ա����ѡ�� 
+        
+            ArrayList empList = new ArrayList(); 
+            DataTable  dt =_logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue))  ;
+            foreach (DataRow dr in dt.Rows) 
+            {
+                empList.Add(dr["pk_employee"]);
+            }
+        SetCheckedNode(TreeDeptEmp.Nodes, empList);
+
+        bindGV();
+
+    }
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+
+        bindGV();
+       
+    }
+     
+   
+    void bindGV( )
+    {
+        //��Ա��ɫ��Ȩ���嵥
+        string nodevalue = TreeDeptEmp.SelectedValue;
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {     
+      
+          lbEmRole.Text = TreeDeptEmp.SelectedNode.Text + " ��Ա��ɫ�嵥";
+          GvRole.DataSource = _logic.GetRoleByEm(Convert.ToInt32(nodevalue));
+     
+         lbEmAuth.Text = TreeDeptEmp.SelectedNode.Text + " ��ԱȨ���嵥";
+         GVauth.DataSource = _logic.GetAuthByEm(Convert.ToInt32(nodevalue));
+        
+        }
+        GvRole.DataBind();
+        GVauth.DataBind();
+
+        //��ɫ��Ӧ����Ա�嵥
+        if (listRoles.SelectedItem != null)
+        {
+            
+            lbRoleEm.Text = listRoles.SelectedItem.Text + " ��ɫ��Ա�嵥";
+            GvEm.DataSource = _logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue));
+        }
+        GvEm.DataBind();
+    }
+ 
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/RoleEmp.aspx.svn-base b/Dict/.svn/text-base/RoleEmp.aspx.svn-base
new file mode 100644
index 0000000..5f20ccd
--- /dev/null
+++ b/Dict/.svn/text-base/RoleEmp.aspx.svn-base
@@ -0,0 +1,125 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleEmp.aspx.cs" Inherits="RoleEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table   class="Table_NoBorder" width="100%">
+  
+    <tr><td>
+     <table width="100%" class="Table_NoBorder" border="1">
+     <tr class="HeaderStyle">
+     <td  style="width: 120px" ><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��ɫ�б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="��Ա�б�"  /></td>
+     <td style="width: 200px" nowrap>
+        ��<asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text="��ɫ��Ա�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmRole" runat="server" Font-Bold="True" Text="��Ա��ɫ�嵥"  /></td> 
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmAuth" runat="server" Font-Bold="True" Text="��ԱȨ���嵥"  /></td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top">
+         
+         <asp:ListBox id="listRoles" runat="server" width="120px" Height="360px"    OnSelectedIndexChanged="listRoles_SelectedIndexChanged" AutoPostBack="True">
+         </asp:ListBox></td>
+      <td valign ="top"> 
+       
+      
+      <asp:TreeView id="TreeDeptEmp" runat="server"  ShowLines="True" ImageSet="Arrows" 
+             ���� ShowCheckBoxes="All" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged"   >
+             
+             <nodes>
+<asp:TreeNode Text="������" Selected="True" Value="0" Expanded="True" SelectAction="None" ></asp:TreeNode>
+</nodes>
+  <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvEm" runat="server"   AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"> <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField> 
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"> 
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top" ><asp:gridview id="GvRole" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1">
+           <columns>
+                ��
+                <asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����"> <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                <asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����">  
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+           
+                </columns>
+           <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+           <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+           <alternatingrowstyle cssclass="AlternatingItemStyle" />
+       </asp:gridview></td>
+      <td valign ="top">
+           <asp:gridview id="GVauth" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1">
+              <columns>
+                ��
+                <asp:BoundField DataField="auth_name" SortExpression="auth_name" HeaderText="Ȩ������"> <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                <asp:BoundField DataField="auth_desc" SortExpression="auth_desc" HeaderText="Ȩ������"> 
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+         
+     
+     </td>
+     </tr>
+     
+     
+     
+     </table>
+      
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+             
+              </td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/.svn/text-base/RoleMain.aspx.cs.svn-base b/Dict/.svn/text-base/RoleMain.aspx.cs.svn-base
new file mode 100644
index 0000000..04c8183
--- /dev/null
+++ b/Dict/.svn/text-base/RoleMain.aspx.cs.svn-base
@@ -0,0 +1,235 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class RoleMain : PageBase
+{
+    private LRole _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+        if (!IsPostBack)
+        {
+            _logic = new LRole();
+            Databound();
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        GridView1.DataSource = _logic.GetAllActiveData().Tables[0];
+        GridView1.DataBind();
+        UpdateSession();
+        
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRole)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        chkApprove.Checked=_logic.GetRole.role_4Approve ;
+        txtJobName.Text = _logic.GetRole.role_name;
+        txtJobDesc.Text = _logic.GetRole.role_desc;
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    { 
+        Databound();
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+        txtJobName.Focus();
+        GridView1.SelectedIndex = -1;��
+       
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind(); 
+        txtJobName.Focus();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+        if (txtJobDesc.Text.Trim().Length + txtJobName.Text.Trim().Length == 0)
+        {
+            txtJobName.Focus();
+            Databound();
+            DataDetail.Visible = true;
+             ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+                                                  "alert('�������ɫ���ơ�');", true);
+            return;
+
+        }
+        int oper = 0;
+        oper = _logic.GetRole.ID > 0 ? _logic.GetRole.Update() : _logic.GetRole.Add();
+        ClearDetail();
+      
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetRole.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        CheckBox chk;
+        if (e.Row.RowType == DataControlRowType.DataRow)
+        {
+            chk = new CheckBox();
+            chk.Text = "";
+            chk.Enabled = false;
+            chk.Checked = e.Row.Cells[3].Text.Trim().Equals("True");
+            e.Row.Cells[3].Controls.Add(chk);
+        }
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+      
+        string sortExpression = e.SortExpression;
+        if (GridView1.SortDirection == SortDirection.Ascending)                      //����������
+        {
+             
+            SortGridView(sortExpression, " DESC");
+        }
+        else
+         {
+             
+            SortGridView(sortExpression, " ASC");
+        }
+    }
+ private void SortGridView(string sortExpression, string direction)
+   {
+       DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+       dv.Sort = sortExpression + direction;
+       GridView1.DataSource = dv;                       //��DataView�󶨵�GridView��
+       GridView1.DataBind();
+
+    } 
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+        if (_logic.GetRole.ID > 0) 
+         _logic.GetRole.lastmodified = DateTime.Now.ToString();
+        _logic.GetRole.dr = true;
+        _logic.GetRole.role_name = txtJobName.Text;
+        _logic.GetRole.role_desc = txtJobDesc.Text;
+        _logic.GetRole.role_4Approve = chkApprove.Checked;
+    }
+
+    private void chgOperTxt(bool addNew)
+    { 
+        btnSubmit.Enabled = true;
+         DataDetail.Visible = true;
+    }
+
+    private void ClearDetail()
+    {
+        chkApprove.Checked = false;��
+        txtJobName.Text = "";
+        txtJobDesc.Text = "";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+   
+}
\ No newline at end of file
diff --git a/Dict/.svn/text-base/RoleMain.aspx.svn-base b/Dict/.svn/text-base/RoleMain.aspx.svn-base
new file mode 100644
index 0000000..930cb28
--- /dev/null
+++ b/Dict/.svn/text-base/RoleMain.aspx.svn-base
@@ -0,0 +1,123 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleMain.aspx.cs" Inherits="RoleMain" %>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ <%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    
+        <!------ THE DATA GRID AREA ------>
+     
+        <asp:gridview   id="GridView1"  CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        emptydatatext="û�����ݡ�" 
+
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="pk_role"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" AutoGenerateColumns="False">
+						 
+            <Columns>
+<asp:BoundField ReadOnly="True" DataField="PK_ROLE" SortExpression="PK_ROLE" HeaderText="��ɫid" visible="false"></asp:BoundField>
+<asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����">
+ <ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" />
+</asp:BoundField>
+
+<asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����"><ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" /></asp:BoundField>
+<asp:BoundField DataField="ROLE_4Approve" SortExpression="ROLE_4Approve" HeaderText="��˽�ɫ"><ItemStyle Wrap="False" />
+ <HeaderStyle Wrap="False" /></asp:BoundField>
+<asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<EmptyDataTemplate>
+          
+        
+</EmptyDataTemplate> 
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            
+        </asp:gridview>
+        
+        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       </td></tr>
+    <tr><td class="ALine"  ></td>
+        </tr> 
+    <tr><td>
+    
+    
+        <!------ THE ADD /DELETE AREA ------>
+      
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+          <table class="Table_NoBorder" width="100%">
+			<tr><td align="right">
+               <asp:Label ID="Label2" runat="server" CssClass="Label"  Text="��ɫ����"></asp:Label></td><td  >
+              
+					<asp:TextBox ID="txtJobName" runat="server"  CssClass="TextBox" MaxLength="25"    ></asp:TextBox>
+                    
+                     
+                              <asp:RequiredFieldValidator id="RequiredFieldValidator4" runat="server" ControlToValidate="txtJobName"
+                                                ErrorMessage="�������ɫ���ơ�" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator>             
+                                            
+                                            
+                                                </td>
+			 
+			 <td  align="right">
+                 &nbsp;<asp:Label ID="Label3" runat="server" CssClass="Label"  Text="��ɫ����"></asp:Label></td><td  >
+                 &nbsp;<asp:TextBox ID="txtJobDesc" runat="server" CssClass="TextBox_Long" MaxLength="100" Width="255px"  ></asp:TextBox>
+                 
+                 
+                              <asp:RequiredFieldValidator id="RequiredFieldValidator5" runat="server" ControlToValidate="txtJobDesc"
+                                                ErrorMessage="�������ɫ������" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator>             
+                                            </td></tr>
+			<tr><td  align="right">
+                 <asp:Label ID="Label1" runat="server" CssClass="Label"  Text="��˽�ɫ" Visible="true"></asp:Label></td><td colspan ="3" >
+                     <asp:CheckBox id="chkApprove" runat="server">
+                     </asp:CheckBox></td></tr>
+			 
+		  <tr>
+                                        <td colspan="4"  >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                    <tr>
+            <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+            </table>
+        
+              <!------ BUTTONS ------>
+            <table class="Table_NoBorder" width="80%"> 
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+               </td>
+            </tr>
+          </table>      
+            </asp:Panel>
+      
+      
+       
+      
+        </td></tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/AuthorityMain.aspx b/Dict/AuthorityMain.aspx
new file mode 100644
index 0000000..6c74957
--- /dev/null
+++ b/Dict/AuthorityMain.aspx
@@ -0,0 +1,168 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="AuthorityMain.aspx.cs" Inherits="ajax.Dict.AuthorityMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td width="100" height="200" align="left" valign="top" >
+                            <asp:TreeView ID="TreeAuth" runat="server" ShowLines="True" ImageSet="Arrows"  OnSelectedNodeChanged="TreeAuth_SelectedNodeChanged1">
+                                <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+                                <Nodes>
+                                    <asp:TreeNode Text="����Ȩ��" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+                                </Nodes>
+                            </asp:TreeView>
+                        </td>
+                        <td width="1" class="VLine">
+                        </td>
+                        <td width="85%" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:Label ID="lbDataGridTitle" Visible="false" runat="server" CssClass="Label" Text="Ȩ��ά��" />
+                            <asp:Label ID="lbEdit" runat="server" CssClass="Label" Visible="false" Text="" />
+                            <asp:GridView ID="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" DataKeyNames="ID" OnRowDeleting="GridView1_RowDeleting"
+                                AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnSorting="GridView1_Sorting"
+                                OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True"
+                                EmptyDataText='û�����ݡ�' OnRowDataBound="GridView1_RowDataBound1">
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                <Columns>
+                                    <asp:BoundField ReadOnly="True" DataField="ID" Visible="false" HeaderText="Ȩ��id"
+                                        SortExpression="ID"></asp:BoundField>
+                                    <asp:BoundField DataField="AUTH_NAME" HeaderText="Ȩ������" SortExpression="DEP_NAME">
+                                     <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                 
+                                    <asp:BoundField DataField="AUTH_LINK" HeaderText="Ȩ������" SortExpression="AUTH_LINK">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                     <asp:BoundField DataField="AUTH_CLASS" HeaderText="�Ӵ�����" SortExpression="AUTH_CLASS">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="AUTH_PUBLIC" HeaderText="����Ȩ��" SortExpression="AUTH_PUBLIC">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                     <asp:BoundField DataField="AUTH_SPECIAL" HeaderText="����Ȩ��" SortExpression="AUTH_SPECIAL">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                       <asp:BoundField DataField="AUTH_ORDER" HeaderText="Ȩ�ޱ��" SortExpression="DEP_CODE">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+
+                                       <asp:BoundField DataField="AUTH_DESC" HeaderText="Ȩ������" SortExpression="DEP_CODE">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False">
+                                    </asp:BoundField>
+                                    <asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True"  DeleteText=""  
+                                        ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                                        <HeaderStyle HorizontalAlign="Center" Wrap="False" />
+                                        <ItemStyle HorizontalAlign="Center" Wrap="False" />
+                                       
+                                    </asp:CommandField>
+                                </Columns> 
+                                <PagerStyle HorizontalAlign="Right" />
+                                <EmptyDataTemplate>
+                                    û������</EmptyDataTemplate>
+                            </asp:GridView><!--DeleteText="" &lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;-->
+                            <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                <!------ THE ADD /DELETE AREA ------>
+                                <table class="Table_NoBorder" width="90%">
+                                    <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td nowrap>
+                                            <asp:Label ID="Label2" runat="server" CssClass="Label" Text="Ȩ������"></asp:Label>
+                                        </td>
+                                        <td>
+                                            <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                                                ErrorMessage="*">��</asp:RequiredFieldValidator>
+                                        </td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label5" runat="server" CssClass="Label" Text="Ȩ������"></asp:Label>
+                                        </td>
+                                        <td >
+                                            <asp:TextBox ID="txtLink" CssClass="TextBox" runat="server" MaxLength="400" Width="200px"></asp:TextBox>
+                                        </td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label4" runat="server" CssClass="Label" Text="�Ӵ�����"></asp:Label>
+                                        </td>
+                                        <td >
+                                            <asp:TextBox ID="txtFormClass" CssClass="TextBox" runat="server" MaxLength="200" Width="200px"></asp:TextBox>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                       
+                                        <td>
+                                               <asp:CheckBox ID="chkPublic" Text="����Ȩ��" runat="server"></asp:CheckBox>
+                                        </td>
+                                        <td>
+                                            
+                                                <asp:CheckBox ID="chkSpecial" runat="server"   Text="����Ȩ��" ></asp:CheckBox>
+                                        </td>
+                                        <td>
+                                            <asp:Label ID="Label1" runat="server" CssClass="Label" Text="������Ϣ"></asp:Label>
+                                        
+                                        </td>
+                                        <td>
+                                            <asp:CheckBox ID="chkPublicInfo" runat="server" OnCheckedChanged="chkPublicInfo_CheckedChanged"
+                                                AutoPostBack="true"></asp:CheckBox>
+                                            <asp:CheckBox ID="chkAlert" runat="server" Text="������"></asp:CheckBox>
+                                               <asp:CheckBox ID="chkEnable" runat="server" Text="����"></asp:CheckBox>
+                                        </td>
+                                         <td>
+                                            <asp:Label ID="Label3" runat="server" CssClass="Label" Text="Ȩ������"></asp:Label>
+                                        </td>
+                                        <td  >
+                                            <asp:TextBox ID="txtDesc" CssClass="Long_TextBox" runat="server" MaxLength="50" 
+                                                Width="200px" ></asp:TextBox>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        
+                                         <td>
+                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="��ǩ���"></asp:Label>
+                                        </td>
+                                        <td  >
+                                            <asp:TextBox ID="txtOrder" CssClass="TextBox" runat="server" MaxLength="5" 
+                                                Width="100px" ></asp:TextBox>
+                                        </td>
+                                        <td colspan="4" class="ALine">
+                                    </tr>
+                                    <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="center" colspan="6">
+                                            &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                                        </td>
+                                    </tr>
+                                </table>
+                            </asp:Panel>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Dict/AuthorityMain.aspx.cs b/Dict/AuthorityMain.aspx.cs
new file mode 100644
index 0000000..5fc5569
--- /dev/null
+++ b/Dict/AuthorityMain.aspx.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+namespace ajax.Dict
+{
+    public partial class AuthorityMain :PageBase
+    {
+        private LAuthority _logic;
+        protected void Page_Load(object sender, EventArgs e)
+        {
+  
+            if (!IsPostBack)
+            {
+                _logic = new LAuthority();
+                Databound();
+            }
+            SessionSeting();
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+         
+        
+            //װ��ѡ�����Žڵ�IJ�������
+            DataView dv = new DataView(_logic.getAllActiveData().Tables[0]);
+
+            if (TreeAuth.SelectedNode != null)
+            {
+                TreeAuth.SelectedNode.ChildNodes.Clear();
+                BindTree(TreeAuth.SelectedNode.Value, TreeAuth.SelectedNode, dv);
+          
+            //�����б���ѡ�еIJ����µ����в�������
+            dv.RowFilter = "auth_uplevel = '" + TreeAuth.SelectedValue + "'"; 
+            }
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+            UpdateSession();
+            ClearDetail();
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                _logic = (LAuthority)Session[appScope.PagelevelObj]; 
+            }
+        }
+
+        private void UpdateSession()
+        {
+           Session[appScope.PagelevelObj]  = _logic;
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void DetailDataBind()
+        {
+            //������Ϣ��������url������Ϊpublic
+            LAuthority ltmp = new LAuthority();
+            ltmp.Initialize(Convert.ToInt32(TreeAuth.SelectedValue)); 
+            chkPublic.Enabled = !ltmp.GetAuthority.auth_publicInfomation;
+            chkPublicInfo.Enabled = !ltmp.GetAuthority.auth_publicInfomation;
+            chkAlert.Enabled =!chkPublicInfo.Enabled;  //�����Ƶ��ϼ������ǹ�����Ϣ
+            if (chkPublicInfo.Checked)
+            {
+                txtLink.Enabled = false;
+                txtFormClass.Enabled = false;
+            }
+            DataDetail.Visible = true;
+            txtName.Text = _logic.GetAuthority.auth_name;
+            txtDesc.Text = _logic.GetAuthority.auth_desc;
+            txtLink.Text = _logic.GetAuthority.auth_link;
+            txtFormClass.Text = _logic.GetAuthority.auth_class;
+            chkPublic.Checked = _logic.GetAuthority.auth_public;
+            chkPublicInfo.Checked = _logic.GetAuthority.auth_publicInfomation;
+            chkSpecial.Checked = _logic.GetAuthority.auth_special;
+            txtOrder.Text = _logic.GetAuthority.auth_order + "";
+            //�ϼ�Ϊ������Ϣ�����¼�Ҳ������
+           if(ltmp.GetAuthority.auth_publicInfomation) 
+            chkPublicInfo.Checked = ltmp.GetAuthority.auth_publicInfomation;
+        if (ltmp.GetAuthority.auth_public) 
+            chkPublic.Checked = ltmp.GetAuthority.auth_public;
+            chkAlert.Checked = _logic.GetAuthority.auth_marqueen;
+            chkPublic.Checked = _logic.GetAuthority.auth_public;
+            chkEnable.Checked = _logic.GetAuthority.dr;
+             ltmp = null;
+         
+//    chkStatus.Checked = _logic.GetRole.dr;
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            GridView1.SelectedIndex = -1;
+            Databound();
+            DetailDataBind();
+       
+
+
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            DetailDataBind();
+        }
+
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            SetDataBack();
+            //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+            int oper = 0;
+            oper = _logic.GetAuthority.ID > 0 ? _logic.GetAuthority.Update() : _logic.GetAuthority.Add();
+            ClearDetail();
+            Databound();
+            lbEdit.Text = "";
+        }
+
+        protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+            _logic.GetAuthority.Delete();
+            ClearDetail();
+            Databound();
+        }
+
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+    
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+        /***************************************** internal methods ********************************************/
+
+        /// <summary>
+        /// set data from page to shift object
+        /// </summary>
+        private void SetDataBack()
+        {
+            //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+            if (!(_logic.GetAuthority.ID > 0)) 
+            {
+               // _logic.GetAuthority.lastmodified = DateTime.Now.ToString();
+                _logic.GetAuthority.auth_uplevel = Convert.ToInt32(TreeAuth.SelectedValue);
+            }
+
+            _logic.GetAuthority.auth_name = txtName.Text;
+            _logic.GetAuthority.auth_desc = txtDesc.Text; 
+            _logic.GetAuthority.auth_link = txtLink.Text;
+            _logic.GetAuthority.auth_class = txtFormClass.Text;
+            _logic.GetAuthority.auth_public = chkPublic.Checked;
+            _logic.GetAuthority.auth_publicInfomation =chkPublicInfo.Checked  ;
+            _logic.GetAuthority.auth_marqueen =  chkAlert.Checked;             
+            _logic.GetAuthority.auth_special = chkSpecial.Checked;
+            _logic.GetAuthority.auth_order = Convert.ToInt16( txtOrder.Text.Trim());
+             _logic.GetAuthority.dr = chkEnable.Checked;
+
+
+        }
+
+        private void chgOperTxt(bool addNew)
+        {
+            DataDetail.Visible = true;
+            lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearDetail()
+        {
+            txtName.Text = ""; 
+            txtDesc.Text = "";
+            txtLink.Text ="";
+            txtLink.Text = "";
+            chkPublic.Checked = false;
+            chkPublicInfo.Checked = false;
+            DataDetail.Visible = false;
+            chkSpecial.Checked = false;
+        }
+
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            DetailDataBind();
+        }
+
+
+
+        public void BindTree(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "'";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node = new TreeNode();
+                node.Text = row["auth_name"].ToString();
+                node.Value = row["ID"].ToString();
+                if (pNode == null)
+                    //˵���Ǹ��ڵ�
+                {
+            
+                    TreeAuth.Nodes.Add(node);
+                    node.Expanded = false;
+      
+                }
+                else
+                {
+                    pNode.ChildNodes.Add(node);
+                    node.Expanded = false;
+                
+                }
+                BindTree(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+   
+        protected void TreeAuth_SelectedNodeChanged1(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            DataView dv = new DataView(_logic.getAllActiveData().Tables[0]);
+            dv.RowFilter = "auth_uplevel = '" + TreeAuth.SelectedValue + "'";
+            GridView1.DataSource = dv;
+            GridView1.DataBind(); 
+            ClearDetail();
+            if(TreeAuth.SelectedNode.ChildNodes.Count>0)TreeAuth.SelectedNode.Expand();
+        }
+
+        protected void chkPublicInfo_CheckedChanged(object sender, EventArgs e)
+        {
+            switch (chkPublicInfo.Checked)
+            {
+                case true:
+                    txtLink.Text = string.Empty;
+                    txtLink.Enabled = false;
+                    txtFormClass.Text = string.Empty;
+                    txtFormClass.Enabled = false;
+                    chkPublic.Checked = true;
+                    chkPublic.Enabled = false;
+                    break;
+
+                case false:
+                    txtLink.Text = _logic.GetAuthority.auth_link;
+                    txtFormClass.Text = _logic.GetAuthority.auth_class;
+                    txtFormClass.Enabled = true;
+                    txtLink.Enabled = true ;
+                    chkPublic.Checked = false;
+                    chkPublic.Enabled = true;
+                    break;
+
+            }
+        
+        }
+
+        protected void chkSpecial_CheckedChanged(object sender, EventArgs e)
+        {
+             
+
+        }
+ ��
+
+        protected void GridView1_RowDataBound1(object sender, GridViewRowEventArgs e)
+        {
+    
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.Text = "";
+                chk.Enabled = false;
+                chk.Checked = e.Row.Cells[4].Text.Trim().Equals("True");
+                e.Row.Cells[4].Controls.Add(chk);
+
+
+                chk = new CheckBox();
+                chk.Text = "";
+                chk.Enabled = false;
+                chk.Checked = e.Row.Cells[5].Text.Trim().Equals("True");
+                e.Row.Cells[5].Controls.Add(chk);
+
+
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dict/DeptEmp.aspx b/Dict/DeptEmp.aspx
new file mode 100644
index 0000000..18a5a51
--- /dev/null
+++ b/Dict/DeptEmp.aspx
@@ -0,0 +1,90 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="DeptEmp.aspx.cs" Inherits="DeptEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table class="Table_NoBorder" width="100%">
+        <tr>
+            <td>
+                <table width="100%" class="Table_NoBorder" border="1">
+                    <tr>
+                        <td style="width: 300px">
+                            <asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��Ա�б�" />
+                        </td>
+                        <td style="width: 300px">
+                            <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="�����б�" />
+                        </td>
+                        <td style="width: 300px" nowrap>
+                            <asp:Label ID="lbEmDept" runat="server" Font-Bold="True" Text="��Ա�����嵥" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td valign="top">
+                            <asp:TreeView ID="TreeDeptEmp" runat="server" ShowLines="True" ImageSet="Arrows"
+                                OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged">
+                                <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+                                <Nodes>
+                                    <asp:TreeNode Text="WMS" Selected="True" Value="0" Expanded="True" SelectAction="None">
+                                    </asp:TreeNode>
+                                </Nodes>
+                            </asp:TreeView>
+                        </td>
+                        <td valign="top">
+                            <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" ImageSet="Arrows" ShowCheckBoxes="All"
+                                OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged">
+                                <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+                                <Nodes>
+                                    <asp:TreeNode Text="WMS" Selected="True" Value="0" Expanded="True" SelectAction="None">
+                                    </asp:TreeNode>
+                                </Nodes>
+                            </asp:TreeView>
+                        </td>
+                        <td valign="top">
+                            &nbsp;<asp:GridView ID="GvDept" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                EmptyDataText="û�����ݡ�" ShowFooter="True" DataKeyNames="ID" Width="100%" TabIndex="1"
+                                OnRowCancelingEdit="GvDept_RowCancelingEdit" OnRowUpdating="GvDept_RowUpdating"
+                                OnRowEditing="GvDept_RowEditing">
+                                <Columns>
+                                    <asp:BoundField ReadOnly="True" DataField="ID" Visible="False" SortExpression="ID"
+                                        HeaderText="id"></asp:BoundField>
+                                    <asp:BoundField ReadOnly="True" DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������">
+                                    </asp:BoundField>
+                                    <asp:BoundField ReadOnly="True" DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������">
+                                    </asp:BoundField>
+                                    <asp:TemplateField SortExpression="DE_TITLE" HeaderText="ְ��">
+                                        <EditItemTemplate>
+                                            <asp:TextBox runat="server" Text='<%# Bind("DE_TITLE") %>' ID="TextBox1"></asp:TextBox>
+                                        </EditItemTemplate>
+                                        <ItemTemplate>
+                                            <asp:Label runat="server" Text='<%# Bind("DE_TITLE") %>' ID="Label1"></asp:Label>
+                                        </ItemTemplate>
+                                    </asp:TemplateField>
+                                    <asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif"
+                                        ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True">
+                                    </asp:CommandField>
+                                </Columns>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center" />
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center" />
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle" />
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                            </asp:GridView>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td class="ALine">
+            </td>
+        </tr>
+        <tr>
+            <td align="center">
+                &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+            </td>
+        </tr>
+        <tr>
+            <td style="width: 532px">
+                <br />
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Dict/DeptEmp.aspx.cs b/Dict/DeptEmp.aspx.cs
new file mode 100644
index 0000000..3a16c1d
--- /dev/null
+++ b/Dict/DeptEmp.aspx.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+using DeiNiu.wms.Data.Model;
+
+public partial class DeptEmp : PageBase
+{
+    private LEmployee _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LEmployee();
+             
+            Databound();  
+           
+             //�����ɫʱ��ʼ��������Ա��
+            
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+         bindGV();
+         UpdateSession();
+        bindDept();
+        bindDeptEmp();
+ 
+        
+    }
+
+    /// <summary>
+    /// �󶨲��� 
+    /// </summary>
+    private void bindDept()
+    {
+        TreeDept.Nodes.Clear();
+        BindTree(TreeDept, "0", TreeDept.SelectedNode, _logic.GetDepartments().DefaultView);
+        SetTreeDeptChecked();
+
+    }
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeDeptEmp.Nodes.Clear();
+        BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode, _logic.GetDepartments().DefaultView, _logic.GetActivedEmpDept().DefaultView);
+      
+       
+         
+    }
+
+   
+ 
+    public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["ID"].ToString() +  "_<em>" + row["dep_name"] + "</em>" ;
+            node.Value = row["ID"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+                empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  , emrow["empId"].ToString()); 
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+
+                tree.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindEmpTree(tree,node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+    public void BindTree(TreeView tree, string id, TreeNode pNode, DataView deptdv )
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+             
+            TreeNode node = new TreeNode();
+            node.Text = row["ID"].ToString() +"_<Strong>" + row["dep_name"].ToString() + "</Strong>";
+            node.Value = row["ID"].ToString();
+
+            node.SelectAction = TreeNodeSelectAction.None;
+           
+          //  node.ShowCheckBox = Convert.ToInt16(row["dep_type"].ToString()) == 1;
+          
+            node.Expanded = true;
+           
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+                tree.Nodes.Add(node);                
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+            }
+            BindTree(tree, node.Value, node, new DataView(deptdv.Table));
+
+        }
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LEmployee)Session[appScope.PagelevelObj];   
+        }
+    }
+
+    private void UpdateSession()
+    {
+       Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+ 
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        if (TreeDeptEmp.SelectedNode== null)  return;
+        ArrayList al = new ArrayList();
+
+        GetCheckedNode(TreeDept.Nodes, al);
+        _logic.Initialize();
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                _logic.GetDeptEmp.Delete(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+
+                foreach (string id in al)
+                {
+                    _logic.GetDeptEmp.de_dept = Convert.ToInt32(id);
+                    _logic.GetDeptEmp.de_employee = Convert.ToInt32(TreeDeptEmp.SelectedValue);
+                    _logic.GetDeptEmp.Add();
+                } 
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣������ʧ�ܡ�");
+            }
+
+
+        }
+      
+       
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+       
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+    void SetTreeDeptChecked()
+    {
+       if( TreeDeptEmp.SelectedNode ==null) return;
+        ArrayList deptList = new ArrayList();
+        DataTable dt = _logic.GetDepartments(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+        foreach (DataRow dr in dt.Rows)
+        {
+            deptList.Add(dr["de_dept"]);
+        }
+        SetCheckedNode(TreeDept.Nodes, deptList); 
+    }
+     
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GvDept.SelectedIndex = -1;
+        SetTreeDeptChecked();   
+        bindGV();
+       
+    }
+     
+   
+    void bindGV( )
+    {
+        //��Ա�����嵥
+        string nodevalue = TreeDeptEmp.SelectedValue;
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {     
+      
+          lbEmDept.Text = TreeDeptEmp.SelectedNode.Text + " ��Ա�����嵥";
+          GvDept.DataSource = _logic.GetDepartments(Convert.ToInt32(nodevalue));
+     
+       
+        }
+        GvDept.DataBind();
+       
+    }
+
+    protected void GvDept_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+        if (GvDept.DataKeys != null)
+        {
+            string id = GvDept.DataKeys[e.RowIndex].Value.ToString();
+
+            _logic.GetDeptEmp.ID = Convert.ToInt32(id);
+            _logic.GetDeptEmp.getModel();
+
+            _logic.GetDeptEmp.de_title = ((TextBox)GvDept.Rows[e.RowIndex].Cells[3].Controls[1]).Text;
+           
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetDeptEmp.Update();
+        }
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        GvDept.EditIndex = e.NewEditIndex;
+        GvDept.SelectedIndex = e.NewEditIndex;
+        bindGV();
+    }
+}
\ No newline at end of file
diff --git a/Dict/DeptMain.aspx b/Dict/DeptMain.aspx
new file mode 100644
index 0000000..1066dc5
--- /dev/null
+++ b/Dict/DeptMain.aspx
@@ -0,0 +1,144 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="DeptMain.aspx.cs" Inherits="DeptMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="WMS" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td width="1" class="VLine" ></td>
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        <asp:Label ID="lbDataGridTitle" Visible="false" runat="server"  CssClass="Label" Text="������"  />
+        <asp:Label ID="lbEdit" Visible="false" runat="server"  CssClass="Label" Text=""></asp:Label>
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="95% " ShowFooter="True" EmptyDataText='û�����ݡ�'>
+						 
+            <Columns>
+<asp:BoundField ReadOnly="True" DataField="ID" Visible="true" SortExpression="ID" HeaderText="���ű��"></asp:BoundField>
+<asp:BoundField DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="DEP_CODE" SortExpression="DEP_CODE" HeaderText="���Ŵ���"></asp:BoundField>
+<asp:BoundField DataField="EM_NAME" SortExpression="DEP_CODE" HeaderText="������"></asp:BoundField>
+<asp:BoundField DataField="typeName" SortExpression="typeName" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������"></asp:BoundField>
+<asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            <emptydatatemplate> û������</emptydatatemplate>
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" /> 
+         
+          <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder" width="90%">
+          <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="��������"></asp:Label></td><td  >
+                 
+					<asp:TextBox ID="txtDepName" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtDepName"
+                    ErrorMessage="*" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+			<td>
+                &nbsp;<asp:Label ID="Label4" runat="server"  CssClass="Label" Text="���Ŵ���"></asp:Label></td><td  >
+					<asp:TextBox ID="txtDepcode" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                </td>
+			</tr>
+			<tr>
+			<td>
+                 <asp:Label ID="Label15" runat="server"  CssClass="Label" Text="�������"></asp:Label></td>
+                 <td  >
+              
+                    <asp:DropDownList ID="dlstDeptType" runat="server" CssClass="DropDownList">
+                    
+                     </asp:DropDownList></td>
+               
+                    <td>
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="��������"></asp:Label></td>
+                         <td  >
+                        <asp:TextBox ID="txtDepDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50"></asp:TextBox>
+                        
+                    
+                  </td>
+             </tr>
+            <tr>
+		     	<td  >
+                 <asp:Label ID="Label1" runat="server"  CssClass="Label" Text="���Ÿ�����"></asp:Label></td>
+                 <td    >
+                     
+                     <asp:DropDownList ID="DropDownList1" runat="server" CssClass="DropDownList">
+                     </asp:DropDownList></td>
+                   
+                    <td  >
+                 <asp:Label ID="Label5" runat="server"  CssClass="Label" Text="�ϼ�����"></asp:Label></td>
+                 <td    >
+                     
+                     <asp:DropDownList ID="drplstDept" runat="server" CssClass="DropDownList">
+                     </asp:DropDownList></td>
+                     
+               </tr>
+
+                <tr>
+		     	   <td    >
+                 <asp:Label ID="Label7" runat="server"  CssClass="Label" Text="�����ַ"></asp:Label></td>
+                 <td  colspan ="3"  >
+                     
+                     <asp:TextBox ID="txtSvrAddress"  CssClass="Long_TextBox" runat="server" MaxLength="50"></asp:TextBox>
+                       
+                     </td>
+                     
+               </tr>
+
+
+
+			<tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+              <tr> 
+            <td   align="center"  colspan ="4" >   <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                 </td>
+            </tr>
+            </table>
+            </asp:Panel>
+       </td></tr>
+     
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Dict/DeptMain.aspx.cs b/Dict/DeptMain.aspx.cs
new file mode 100644
index 0000000..29eb013
--- /dev/null
+++ b/Dict/DeptMain.aspx.cs
@@ -0,0 +1,429 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+using DeiNiu.wms.Data.Model;
+
+public partial class DeptMain : PageBase
+{
+    private LDepartment _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LDepartment();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        //�󶨲����б�
+        drplstDept.DataSource = _logic.GetAllActiveData();
+        drplstDept.DataTextField = "dep_name";
+        drplstDept.DataValueField = "ID";
+        drplstDept.DataBind();
+    
+
+
+
+        drplstDept.Items.Insert(0, (new ListItem("WMS", "0")));
+        drplstDept.SelectedItem.Selected = false;
+        drplstDept.Items.FindByText("WMS").Selected = true;
+
+
+
+        //�󶨲�����Ա�б�
+         DropDownList1.DataSource = _logic.GetEmployees();
+        DropDownList1.DataTextField = "em_name";
+        DropDownList1.DataValueField = "ID";
+        DropDownList1.DataBind();
+        DropDownList1.Items.Insert(0,(new ListItem("��ѡ��...","0")));
+        DropDownList1.SelectedItem.Selected = false;
+        DropDownList1.Items.FindByText("��ѡ��...").Selected = true;
+        //װ��ѡ�����Žڵ�IJ������� 
+
+        dlstDeptType.Items.Clear();
+        dlstDeptType.Items.Add(new ListItem("��ͨ", "0")); 
+        dlstDeptType.Items.Add(new ListItem("�ֹ�", "1"));
+        dlstDeptType.Items.Add(new ListItem("�ֿ�", "2")); 
+        dlstDeptType.Items.Add(new ListItem("����", "3"));
+        DataView dv = _logic.GetAllActiveData().DefaultView;
+        string selectedValue = TreeDept.SelectedValue;
+        TreeDept.Nodes.Clear();
+        TreeDept.Nodes.Add(new TreeNode("WMS", "0"));
+        TreeDept.Nodes[0].Expanded = true;
+        BindTree("0", TreeDept.Nodes[0], dv);
+        //   TreeDept.SelectedNode.ChildNodes.Clear();
+        //     BindTree(TreeDept.SelectedValue, TreeDept.SelectedNode, dv);
+        //     TreeDept.Nodes.AddAt(0, new TreeNode("WMS", "0"));
+        if (selectedValue == "0") TreeDept.Nodes[0].Selected = true;
+        else
+        {
+            setTreeDeptSelected(selectedValue, TreeDept.Nodes[0]);
+        }
+       dv.RowFilter = "dep_mastdept = '" + selectedValue + "'";
+       bindGridview(dv);
+       
+        UpdateSession();
+    // btnSubmit.Enabled = false;
+      //  ClearDetail();
+
+
+        drplstDept.Items.Clear();
+        initializeDrlstDept(TreeDept.Nodes, drplstDept ,"");
+    }
+
+    void bindGridview(DataView dv )
+    {
+       
+        //�����б���ѡ�еIJ����µ����в�������
+       
+
+        foreach (DataRowView drv in dv)
+        {
+            foreach (ListItem li in dlstDeptType.Items)
+            {
+                if (drv["dep_type"].ToString().Equals(li.Value))
+                {
+                    drv.Row["typeName"] = li.Text;
+                }
+            }
+        }
+
+        GridView1.DataSource = dv;
+        GridView1.DataBind();
+    }
+
+    void initializeDrlstDept(TreeNodeCollection nds, DropDownList drplist, string emptyString)
+    {
+        
+       
+        foreach (TreeNode nd in nds)
+        {
+            
+            ListItem li = new ListItem(emptyString + nd.Text,nd.Value);
+            drplist.Items.Add(li); 
+            string NextemptyString = emptyString+ "----";
+            foreach (TreeNode nd1 in nd.ChildNodes)
+            {
+               li = new ListItem(NextemptyString + nd1.Text, nd1.Value);
+                    drplist.Items.Add(li);
+                   
+                if (nd1.ChildNodes.Count > 0)
+                {
+                    NextemptyString +="----";
+                   initializeDrlstDept(nd1.ChildNodes, drplist, NextemptyString);
+                }
+
+
+            }
+        }
+    }
+
+
+
+    void setTreeDeptSelected(string toFind,TreeNode nd)
+    {
+        foreach (TreeNode cnd in nd.ChildNodes)
+        {
+            if (cnd.Value == toFind) 
+            {
+                cnd.Selected = true;
+                break;
+            }
+            else
+            {
+                setTreeDeptSelected(toFind,cnd);
+            }
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LDepartment)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtDepName.Text = _logic.GetDepartment.dep_name ;
+        txtDepcode.Text = _logic.GetDepartment.dep_code;
+        txtDepDesc.Text = _logic.GetDepartment.dep_desc;
+        txtSvrAddress.Text = _logic.GetDepartment.svrAdress;
+       // txtDepType.Text = _logic.GetDepartment.dep_type+"";
+        DropDownList1.SelectedItem.Selected = false;
+        if(DropDownList1.Items.FindByValue(_logic.GetDepartment.dep_manager.ToString())!=null)
+        {
+          DropDownList1.Items.FindByValue(_logic.GetDepartment.dep_manager.ToString()).Selected = true;  
+        }
+        drplstDept.SelectedItem.Selected = false;
+        if (drplstDept.Items.FindByValue(_logic.GetDepartment.dep_mastdept.ToString()) != null)
+        {
+            drplstDept.Items.FindByValue(_logic.GetDepartment.dep_mastdept.ToString()).Selected = true;
+        }
+        dlstDeptType.SelectedItem.Selected = false;
+        if (dlstDeptType.Items.FindByValue(_logic.GetDepartment.dep_type.ToString()) != null)
+        {
+            dlstDeptType.Items.FindByValue(_logic.GetDepartment.dep_type.ToString()).Selected = true;
+        }
+        
+         
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+        GridView1.SelectedIndex = -1;
+        Databound();
+        drplstDept.SelectedItem.Selected = false;
+        if (drplstDept.Items.FindByValue(TreeDept.SelectedNode.Value) != null)
+        {
+            drplstDept.Items.FindByValue(TreeDept.SelectedNode.Value).Selected = true;
+        }
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+
+        if (_logic.GetDepartment.ID > 0)
+        {
+            _logic.GetDepartment.Update();
+        }
+        else
+        {
+            _logic.GetDepartment.Add();
+            if (_logic.GetDepartment.warehouse == 0 && _logic.GetDepartment.dep_type==1)
+            {
+                _logic.GetDepartment.warehouse = _logic.GetDepartment.ID;
+                _logic.GetDepartment.Update();
+            }
+        }
+
+        
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetDepartment.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        /*
+        CheckBox chk;
+        if (e.Row.RowType == DataControlRowType.DataRow)
+        {
+            chk = new CheckBox();
+            chk.Text = "����";
+            chk.Enabled = false;
+            chk.Checked = e.Row.Cells[3].Text.Trim().Equals("1");
+            e.Row.Cells[3].Controls.Add(chk);
+        }
+      */
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       if (!(_logic.GetDepartment.ID > 0 )) 
+       {
+         // _logic.GetDepartment.lastmodified = DateTime.Now.ToString(); 
+          _logic.GetDepartment.dep_mastdept = Convert.ToInt32(TreeDept.SelectedValue);
+       }
+        
+      // _logic.GetDepartment.dr = true;
+       _logic.GetDepartment.dep_name = txtDepName.Text;
+       _logic.GetDepartment.dep_desc = txtDepDesc.Text;
+       _logic.GetDepartment.dep_code = txtDepcode.Text; 
+        _logic.GetDepartment.svrAdress =  txtSvrAddress.Text;
+       if (dlstDeptType.SelectedItem != null) _logic.GetDepartment.dep_type = Convert.ToInt16(dlstDeptType.SelectedValue); 
+        if (DropDownList1.SelectedItem != null ) _logic.GetDepartment.dep_manager = Convert.ToInt32(DropDownList1.SelectedValue);
+        if (drplstDept.SelectedItem != null) _logic.GetDepartment.dep_mastdept = Convert.ToInt32(drplstDept.SelectedValue);
+
+        if (_logic.GetDepartment.dep_type != (int)enumDepartmentType.�ֿ�)//�����Ų��Dzֿ�����
+        {
+            if (_logic.GetDepartment.dep_mastdept > 0) //�̳��ϼ����ŵIJֿ�����
+            {
+                Department dept = new Department(_logic.GetDepartment.dep_mastdept);
+                if (dept.dep_type != 1)
+                {
+                    _logic.GetDepartment.warehouse = dept.warehouse;
+                }
+                else
+                {
+                    _logic.GetDepartment.warehouse = dept.ID;
+                }
+            }
+        }
+        else
+        {
+            _logic.GetDepartment.warehouse = _logic.GetDepartment.ID;
+           
+        }
+
+
+    
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtDepName.Text = "";
+        txtDepcode.Text = "";
+        txtDepDesc.Text = "";
+        //txtDepType.Text ="";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+        
+        dv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["dep_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+       GridView1.SelectedIndex = -1; 
+        DataView dv = new DataView(_logic.GetAllActiveData()); 
+        dv.RowFilter = "dep_mastdept = '" + TreeDept.SelectedValue + "'"; 
+        bindGridview(dv);
+        ClearDetail();
+    }
+}
\ No newline at end of file
diff --git a/Dict/EmployeeMain.aspx b/Dict/EmployeeMain.aspx
new file mode 100644
index 0000000..6c220e3
--- /dev/null
+++ b/Dict/EmployeeMain.aspx
@@ -0,0 +1,290 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master"  
+    AutoEventWireup="true" CodeFile="EmployeeMain.aspx.cs" Inherits="EmployeeMain" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td> 
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td width="50" height="200" align="left" valign="top">
+                            <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged"
+                                ImageSet="Arrows">
+                                <nodes>
+                <asp:TreeNode Text="WMS" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </nodes>
+                                <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                            </asp:TreeView>
+                            <asp:TextBox id="TextBox11" runat="server" visible=false>
+    </asp:TextBox>
+     
+    <cc1:calendarextender id="CalendarExtender11" runat="server" targetcontrolid="TextBox11"></cc1:calendarextender>
+    
+                        </td>
+                        <td width="1" class="VLine">
+                        </td>
+                        <td align="left" valign="top" width="90%">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:Label ID="lbDataGridTitle" Visible="false" runat="server" CssClass="Label" Text="��Աά��" />
+                            <asp:Label ID="lbEdit" Visible="false" runat="server" CssClass="Label" Text=""></asp:Label>
+                            <asp:gridview id="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" OnRowEditing="GridView1_RowEditing"
+                                DataKeyNames="de_employee" OnRowDeleting="GridView1_RowDeleting" AllowPaging="True"
+                                OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                <columns>
+				<asp:BoundField  Visible="TRUE"  ReadOnly="True" DataField="de_employee" HeaderText="��Ա���" SortExpression="de_employee" >
+                 <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                 <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="����" SortExpression="EM_NAME">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                	<asp:BoundField DataField="DEP_NAME" HeaderText="����" SortExpression="DEP_NAME" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_SEX" HeaderText="�Ա�" SortExpression="EM_SEX" HtmlEncode="False"   DataFormatString="{0:True:��;False:Ů}">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_BIRTHDAY" HeaderText="��������" SortExpression="EM_BIRTHDAY"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" Visible="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="de_title" HeaderText="ְ��" SortExpression="de_title">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="em_education" HeaderText="ѧ��" SortExpression="em_education" Visible="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="em_politic" HeaderText="��Ա����" SortExpression="em_politic" Visible="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="em_date_in_party" HeaderText="�뵳ʱ��" SortExpression="em_date_in_party" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" Visible="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="em_date_work" HeaderText="�μӹ���ʱ��" SortExpression="em_date_work"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" Visible="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText=" " ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</columns>
+                                <pagerstyle horizontalalign="Right" />
+                                <emptydatatemplate> û������</emptydatatemplate>
+                            </asp:gridview>
+                            <!--DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" -->
+                            <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+                            
+                             <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                <!------ THE ADD /DELETE AREA ------>
+                                <table class="Table_NoBorder" border="0" width="95%">
+                                 <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                        </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label2" runat="server" CssClass="Label" Text='����'></asp:Label></td>
+                                        <td nowrap>
+                                            <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25">
+                                            </asp:TextBox>
+                                            <asp:RequiredFieldValidator id="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                                                ErrorMessage="�������û�����" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                        <td>
+                                            <asp:Label ID="Label4" runat="server" CssClass="Label" Text='�Ա�'></asp:Label></td>
+                                        <td>
+                                            <asp:DropDownList ID="drplstSex" runat="server" CssClass="DropDownList">
+                                                <asp:ListItem Value="1">��</asp:ListItem>
+                                                <asp:ListItem Value="0">Ů</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                        <td nowrap>
+                                            &nbsp;</td>
+                                        <td>
+                                            &nbsp;</td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="����֤��"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtID" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox>
+                                        </td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��Ա����"></asp:Label></td>
+                                        <td>
+                                            <asp:DropDownList ID="drlstPlitics" runat="server" CssClass="DropDownList">
+                                                <asp:ListItem Value="0">�ֿ�Ա��</asp:ListItem>
+                                                <asp:ListItem Value="1">������Ա</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                        <td nowrap>
+                                            &nbsp;</td>
+                                        <td>
+                                            &nbsp;</td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="Label10" runat="server" CssClass="Label" Text="��������"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtMail" CssClass="TextBox" runat="server" MaxLength="25" CausesValidation="True"></asp:TextBox>
+                                            <asp:RegularExpressionValidator id="RegularExpressionValidator1" runat="server" ControlToValidate="txtMail"
+                                                ErrorMessage="���������ʽ����ȷ����ȷ��ʽ��zhangsan@163.net��" ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*"
+                                                ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator>&nbsp;
+                                        </td>
+                                        <td>
+                                            ��������</td>
+                                        <td>
+                                            <asp:TextBox ID="txtBirthday" runat="server" CssClass="TextBox" MaxLength="25">
+                                            </asp:TextBox>
+                                        </td>
+                                        <td>
+                                            ѧ��</td>
+                                        <td>
+                                            <asp:DropDownList ID="drplstEducation" CssClass="DropDownList" runat="server">
+                                                <asp:ListItem>��ʿ</asp:ListItem>
+                                                <asp:ListItem>˶ʿ�о���</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>ר��</asp:ListItem>
+                                                <asp:ListItem>��ר</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                                <asp:ListItem>Сѧ</asp:ListItem>
+                                                <asp:ListItem>����</asp:ListItem>
+                                            </asp:DropDownList></td>
+                                    </tr>
+                                    <tr>
+                                        <td nowrap>
+                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="�˺�"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtAccount" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox>
+                                            <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtAccount"
+                                                ErrorMessage="�������˺š�" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                        <td nowrap>
+                                            <asp:Label ID="Label8" runat="server" CssClass="Label" Text="����"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtPasswd" CssClass="TextBox" runat="server" MaxLength="25" TextMode="Password">
+                                            </asp:TextBox></td>
+                                        <td>
+                                            <asp:Label ID="Label9" runat="server" CssClass="Label" Text="�ֻ�"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtCell" CssClass="TextBox" runat="server" MaxLength="25" CausesValidation="True"></asp:TextBox>
+                                            <asp:RegularExpressionValidator id="RegularExpressionValidator2" runat="server" ControlToValidate="txtCell"
+                                                Display="Dynamic" ErrorMessage="�ֻ������ʽ����ȷ��ӦΪ11λ���֡�" ValidationExpression="^\d{11}$" ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator></td>
+                                    </tr>
+                                    <tr>
+                                        <td nowrap>
+                                            <asp:Label ID="lableDept" runat="server" CssClass="Label" Text="��ǰ����"></asp:Label></td>
+                                        <td>
+                                            <asp:Label ID="lbSelectedDept" runat="server" CssClass="Label" Text="" /></td>
+                                        <td nowrap>
+                                            <asp:Label ID="lbTitle" runat="server" CssClass="Label" Text="ְ��"></asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="txtTitle" CssClass="TextBox" runat="server" MaxLength="25">
+                                            </asp:TextBox></td>
+                                        <td>
+                                        </td>
+                                        <td>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Label ID="lbempdept" runat="server" CssClass="Label" Text="���ŷ���"></asp:Label></td>
+                                        <td colspan="4" align="center">
+                                            <asp:gridview id="GvDept" runat="server" AutoGenerateColumns="False" CssClass="DataGrid"
+                                                DataKeyNames="ID" emptydatatext="û�����ݡ�" ShowFooter="True" tabIndex="1"
+                                                Width="100%" OnRowCancelingEdit="GvDept_RowCancelingEdit" OnRowUpdating="GvDept_RowUpdating"
+                                                OnRowEditing="GvDept_RowEditing">
+                                                <columns>
+                        <asp:BoundField  ReadOnly="True" DataField="ID" Visible="False" SortExpression="ID" HeaderText="id"></asp:BoundField>
+                        <asp:BoundField  ReadOnly="True" DataField="DEP_NAME" SortExpression="DEP_NAME" HeaderText="��������"></asp:BoundField>
+                        <asp:BoundField ReadOnly="True" DataField="DEP_DESC" SortExpression="DEP_DESC" HeaderText="��������"></asp:BoundField>
+                      <asp:TemplateField SortExpression="DE_TITLE" HeaderText="ְ��"><EditItemTemplate>
+                   <asp:TextBox runat="server" Text='<%# Bind("DE_TITLE") %>' id="TextBox1"></asp:TextBox>
+            
+                    </EditItemTemplate>
+                    <ItemTemplate>
+                                <asp:Label runat="server" Text='<%# Bind("DE_TITLE") %>' id="Label1"></asp:Label>
+                                
+                    </ItemTemplate>
+                    </asp:TemplateField>
+                    <asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif" ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True"></asp:CommandField>
+                    </columns>
+                                                <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+                                                <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+                                                <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                                                <selectedrowstyle cssclass="SelectedItemStyle" />
+                                            </asp:gridview>
+                                            </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                        </td>
+                                        <td>
+                                            <cc1:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="txtBirthday"
+                                                FirstDayOfWeek="Monday" CssClass="MyCalendar">
+                                            </cc1:CalendarExtender>
+                                        </td>
+                                        <td>
+                                            &nbsp;</td>
+                                        <td>
+                                            &nbsp;</td>
+                                        <td>
+                                        </td>
+                                        <td>
+                                        </td>
+                                    </tr>
+                                     <tr>
+                                        <td colspan="6"  >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                    <tr>
+                                        <td colspan="6" class="ALine">
+                                        </td>
+                                        </tr>
+                    <tr>
+                        <td colspan="6" align="center">
+                            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="����" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                            <!--input type="button" id="ButtonCancel" onClick="reset()"  class="Button"	value="ȡ���޸�" name="ButtonCancel"/-->
+                        </td>
+                    </tr>
+                </table>
+                         </asp:Panel>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center" style="height: 309px" valign="top">
+                            <!------ THE ADD /DELETE AREA ------>
+                         
+                    </td>
+                 </tr>
+             </table>
+    </td>
+    </tr> 
+    </table>
+</asp:Content>
diff --git a/Dict/EmployeeMain.aspx.cs b/Dict/EmployeeMain.aspx.cs
new file mode 100644
index 0000000..544f18f
--- /dev/null
+++ b/Dict/EmployeeMain.aspx.cs
@@ -0,0 +1,534 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using view.App_Code;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class EmployeeMain : PageBase
+{
+    private LEmployee _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            
+            _logic = new LEmployee();
+            bindDeptTree();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    void bindDeptTree()
+    {
+    
+        DataView dvDept = new DataView(_logic.GetDepartments());
+      
+        //װ��ѡ�����Žڵ�IJ�������
+
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+    }
+
+
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+       
+        //�󶨲�����ѡ�еIJ����µ�����Ա������
+        bindGrid();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LEmployee)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtAccount.ReadOnly = true;
+        txtName.Text = _logic.GetEmployee.em_name;
+        txtBirthday.Text = _logic.GetEmployee.em_birthday.ToString();
+        txtCell.Text = _logic.GetEmployee.em_cellnum;
+        
+        txtID.Text = _logic.GetEmployee.em_idnum;
+        txtMail.Text = _logic.GetEmployee.em_email;
+       //txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtAccount.Text = _logic.GetEmployee.em_account;
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+        drplstSex.Items.FindByValue("1").Selected = true;
+
+        if (_logic.GetEmployee.em_sex)
+        {
+            drplstSex.Items.FindByValue("0").Selected = false;
+            drplstSex.Items.FindByValue("1").Selected = true;
+        }
+        else
+        {  
+            drplstSex.Items.FindByValue("1").Selected = false;
+            drplstSex.Items.FindByValue("0").Selected = true;
+        }
+        if (drplstEducation.Items.FindByValue(_logic.GetEmployee.em_education) != null)
+ //            drplstEducation.Items.FindByValue(_logic.GetEmployee.em_education).Selected=true;   //ListItemColleciton can only select one item, if another has been selected, this will case error.
+            SetDropDownlistSelection(drplstEducation, _logic.GetEmployee.em_education);
+
+        bindGV();
+
+         if (drlstPlitics.Items.FindByValue(_logic.GetEmployee.em_type) != null)
+             //drlstPlitics.Items.FindByValue(_logic.GetEmployee.em_politic).Selected = true;
+             SetDropDownlistSelection(drlstPlitics, _logic.GetEmployee.em_type);
+
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+
+    void bindGV()
+    { 
+            GvDept.DataSource = _logic.GetDepartments(_logic.GetEmployee.ID); 
+            GvDept.DataBind();
+
+    }
+
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+         if(TreeDept.SelectedValue == "0" )
+         {
+             ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+                                               "alert('��ѡ���û��������š�');", true);
+             return;
+         }
+        txtAccount.ReadOnly = false;
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+        GridView1.SelectedIndex = -1;
+        Databound();
+        txtTitle.Enabled = true;
+        lbTitle.Visible = true;
+        txtTitle.Visible = true;
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+     //   DetailDataBind();
+        DataDetail.Visible = true;
+        bindGV();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+
+        bool userNotExist = true;
+        SetDataBack();
+        if (txtName.Text.Trim().Length == 0)
+        {
+            txtName.Focus();
+             bindGrid();
+       //  ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+       //                                        "alert('�������û�������');", true);
+            return;
+        
+        }
+        if (txtAccount.Text.Trim().Length == 0)
+        {
+            txtAccount.Focus();
+            bindGrid();
+       //     ScriptManager.RegisterStartupScript(btnSubmit, typeof (UpdatePanel), "alert",
+       //                                         "alert('�������û��˺š�');", true);
+            return;
+        }
+
+
+
+
+        /*
+         if(lem.GetEmployee.em_account !="mysec" )
+         if (_logic != null)
+             if (_logic.GetEmployee != null)
+                 if(_logic.GetEmployee.QueryActived().Tables[0].Rows.Count>20)
+                     return;
+         */
+
+        if (_logic != null)
+            if (_logic.GetEmployee != null)
+                if (_logic.GetEmployee.ID > 0)
+                    _logic.GetEmployee.Update();
+                else
+                {
+                    userNotExist = _logic.AddEmployee();
+
+                   
+                }
+        if (!userNotExist)
+        {
+            ScriptManager.RegisterStartupScript(btnSubmit, typeof (UpdatePanel), "alert",
+                                                "alert('�û���   " + txtAccount.Text
+                                                + "  �Ѿ����ڣ����������룬����ʧ�ܡ�');", true);
+
+            bindGrid();
+
+            txtAccount.Text ="";
+            txtAccount.Focus();
+        }
+        else
+        {
+            ClearDetail();
+            Databound();
+            DataDetail.Visible = false;
+        }
+ 
+    }
+    void bindGrid()
+    {
+        _logic.GetEmployee.em_dept = TreeDept.SelectedValue;
+            DataView dv = TreeDept.SelectedValue != "0"
+                ? new DataView(_logic.GetActiveEmpByDept(Convert.ToInt32(TreeDept.SelectedValue))) 
+                : new DataView(_logic.GetActivedEmpDept());
+            dv.RowFilter = "em_name <>'Root'";
+            GridView1.DataSource = dv;
+            GridView1.DataBind();
+
+    }
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+     
+        _logic.GetEmployee.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        Label lb;
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                lb = new Label();
+                lb.Text = e.Row.Cells[3].Text.Trim().Equals("True") ? "��" : "Ů";
+                e.Row.Cells[3].Controls.Add(lb);
+                break;
+        }
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       if ( _logic.GetEmployee.ID >0 ) 
+       { 
+         //  _logic.GetEmployee.lastmodified = DateTime.Now.ToString(); 
+
+           if(txtPasswd.Text.Trim().Length>0)
+               _logic.GetEmployee.em_passwd = Util.Encrypt(txtPasswd.Text.Trim());
+       }
+       else
+       {
+                _logic.GetEmployee.em_passwd = Util.Encrypt(txtPasswd.Text.Trim());
+       }
+      
+
+        
+     //  _logic.GetEmployee.dr = true;
+       _logic.GetEmployee.em_name = txtName.Text;
+       _logic.GetEmployee.em_account = txtAccount.Text;
+       _logic.GetEmployee.em_birthday = txtBirthday.Text;  
+       _logic.GetEmployee.em_cellnum = txtCell.Text;
+ 
+        _logic.GetEmployee.em_education = drplstEducation.SelectedValue;
+       _logic.GetEmployee.em_email = txtMail.Text;  
+       _logic.GetEmployee.em_idnum = txtID.Text;  
+     
+        _logic.GetEmployee.em_type = drlstPlitics.SelectedValue;
+        _logic.GetEmployee.em_sex = drplstSex.SelectedIndex == 0;
+       
+       
+        _logic.GetEmployee.em_dept = TreeDept.SelectedValue;
+        _logic.GetEmployee.em_jobcode = txtTitle.Text;
+
+
+
+       
+
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        lbEdit.Text = "";
+        
+        txtName.Text = "" ;
+        txtBirthday.Text = "";
+        txtCell.Text = "";
+        
+        txtID.Text = "";
+        txtMail.Text ="";
+        txtPasswd.Text ="";
+        txtAccount.Text ="";
+        txtTitle.Text = "";
+        lbSelectedDept.Text = TreeDept.SelectedNode.Text;
+        txtPasswd.Text = "";
+        InitDropdownlist();
+        //װ��ѡ�����Žڵ�IJ�������
+      //  drlstPlitics.SelectedIndex = -1;
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        lbTitle.Visible = false;
+        txtTitle.Visible = false;
+        Databound();
+        DetailDataBind();
+        txtTitle.Enabled = false;
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+        
+        dv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["dep_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        /*
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")  
+             dv.RowFilter = "em_dept = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        */
+        if (_logic != null) _logic.Initialize();
+        GridView1.SelectedIndex = -1;
+        Databound();
+
+        
+    }
+    protected void drplstSex_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        ListItem selectedItem = drplstSex.Items[1];
+        selectedItem.Selected = true;
+    }
+
+    protected void InitDropdownlist()
+    {
+      
+        drplstSex.Items[ drplstSex.SelectedIndex].Selected = false;
+        drplstSex.Items.FindByValue("1").Selected = true;
+
+        drlstPlitics.Items[drlstPlitics.SelectedIndex].Selected = false;
+        drlstPlitics.Items[0].Selected = true;  
+         
+    }
+
+    protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+    {
+        drdlst.Items[drdlst.SelectedIndex].Selected = false;
+        if (drdlst.Items.FindByValue(value)!=null)
+            drdlst.Items.FindByValue(value).Selected = true;
+    }
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    { 
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[11].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "WMSϵͳ�û��б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[11].Visible = true;
+        Databound();   
+        
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+         
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+
+    
+    protected void GvDept_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+        if (GvDept.DataKeys != null)
+        {
+            string id = GvDept.DataKeys[e.RowIndex].Value.ToString();
+
+            _logic.GetDeptEmp.ID = Convert.ToInt32(id);
+            _logic.GetDeptEmp.getModel();
+
+            _logic.GetDeptEmp.de_title = ((TextBox)GvDept.Rows[e.RowIndex].Cells[3].Controls[1]).Text;
+
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetDeptEmp.Update();
+        }
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvDept.EditIndex = -1;
+        GvDept.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvDept_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        GvDept.EditIndex = e.NewEditIndex;
+        GvDept.SelectedIndex = e.NewEditIndex;
+        bindGV();
+    }
+    
+}
\ No newline at end of file
diff --git a/Dict/PublicNewsMain.aspx b/Dict/PublicNewsMain.aspx
new file mode 100644
index 0000000..7b8f358
--- /dev/null
+++ b/Dict/PublicNewsMain.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="PublicNewsMain.aspx.cs" Inherits="PublicNewsMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <table width="100%" class="Table_NoBorder">
+   
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeAuth" runat="server" ShowLines="True"   ImageSet="Arrows" OnSelectedNodeChanged="TreeAuth_SelectedNodeChanged1">
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+            <Nodes>
+<asp:TreeNode Text="������Ϣ����" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+</Nodes>
+        </asp:TreeView>
+    </td>
+    <td width="1" class="VLine" ></td>
+    <td    width="100%" align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        <asp:Label ID="lbDataGridTitle" Visible="false" runat="server"  CssClass="Label" Text="��Ϣά��"  />
+        <asp:Label ID="lbEdit" Visible="false" runat="server"  CssClass="Label" Text=""></asp:Label>
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False"  
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                         
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�' OnRowDataBound="GridView1_RowDataBound">
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" ></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField ReadOnly="True" DataField="ID" visible="false" HeaderText="Ȩ��id" SortExpression="ID" ></asp:BoundField>
+				<asp:BoundField DataField="news_title" HeaderText="��Ϣ����" SortExpression="news_title" ></asp:BoundField>
+				<asp:BoundField DataField="news_content" HeaderText="��Ϣ����" SortExpression="news_content" ></asp:BoundField> 
+			    <asp:BoundField DataField="create_time" HeaderText="����ʱ��" SortExpression="create_time" ></asp:BoundField> 
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="15%" />
+                    <ItemStyle HorizontalAlign="Center" Width="15%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       
+       
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder"  width="100%">
+         <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td  nowrap>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="����"></asp:Label></td>
+                <td    >
+                 
+					<asp:TextBox ID="txtTitle" runat="server"  CssClass="TextBox" MaxLength="100" width="400px"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtTitle"
+                    ErrorMessage="*" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+			 
+               
+			</tr>
+			<tr>
+			
+                    <td style="height: 218px">
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="����"></asp:Label></td><td style="height: 218px"  >
+                        <asp:TextBox ID="txtDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50" Width="803px" Height="300px" TextMode="MultiLine"></asp:TextBox></td>
+                    </tr>
+                
+			  <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+            </table>
+           
+              <!------ BUTTONS ------>
+            <table class="Table_NoBorder" width="80%"> 
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                
+                </td>
+            </tr>
+          </table>      
+       </asp:Panel>
+       
+       </td></tr>
+    
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Dict/PublicNewsMain.aspx.cs b/Dict/PublicNewsMain.aspx.cs
new file mode 100644
index 0000000..ca31d40
--- /dev/null
+++ b/Dict/PublicNewsMain.aspx.cs
@@ -0,0 +1,266 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class PublicNewsMain : PageBase
+{
+    private LPublicNews _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LPublicNews();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+         
+        
+        //װ��ѡ���ڵ������
+        DataView dv = new DataView(_logic.QueryPublicInfomation());
+        
+        TreeAuth.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeAuth.SelectedNode.Value, TreeAuth.SelectedNode, dv);
+        //�����б���ѡ�е���������
+        
+        GridView1.DataSource = _logic.QueryNews(Convert.ToInt32(TreeAuth.SelectedValue));
+        GridView1.DataBind();
+
+       //  GVFiles.DataSource = null;
+       // GVFiles.DataBind();
+        UpdateSession();
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LPublicNews)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+
+        DataDetail.Visible = true;
+        txtTitle.Text = _logic.GetPublicNews.news_title;
+        txtDesc.Text = _logic.GetPublicNews.news_content; 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+      
+        GridView1.SelectedIndex = -1;
+        Databound();
+        DetailDataBind();
+       //todo bind attached files infomationsss\\
+
+
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetPublicNews.ID > 0 ? _logic.GetPublicNews.Update() : _logic.GetPublicNews.Add();
+        ClearDetail();
+        Databound();
+        lbEdit.Text = "";
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetPublicNews.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+        if (!(_logic.GetPublicNews.ID > 0)) 
+       {
+           //_logic.GetPublicNews.last_modified  = DateTime.Now.ToString();
+           _logic.GetPublicNews.news_authority = Convert.ToInt32(TreeAuth.SelectedValue);
+       }
+
+       _logic.GetPublicNews.news_title = txtTitle.Text;
+       _logic.GetPublicNews.news_content = txtDesc.Text; 
+       
+        //todo bind files
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+        lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtTitle.Text = ""; 
+        txtDesc.Text = "";
+       
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+        dv.RowFilter = "auth_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["auth_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeAuth.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+   
+    protected void TreeAuth_SelectedNodeChanged1(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.QueryNews(Convert.ToInt32(TreeAuth.SelectedValue))); 
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+    }
+
+
+
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+
+         
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                if (e.Row.Cells[2].Text.Trim().Length > 30) e.Row.Cells[2].Text = e.Row.Cells[2].Text.Substring(0,30)+"....";
+                
+                break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dict/RoleAuth.aspx b/Dict/RoleAuth.aspx
new file mode 100644
index 0000000..07b4c39
--- /dev/null
+++ b/Dict/RoleAuth.aspx
@@ -0,0 +1,120 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleAuth.aspx.cs" Inherits="RoleAuth" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+     
+    <tr><td>
+     <table width="100%" class="Table_NoBorder" border="1">
+     <tr class="HeaderStyle">
+     <td style="width: 120px"><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��ɫ�б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbAuth" runat="server" Font-Bold="True" Text="Ȩ���б�"  /></td>
+     <td style="width: 200px" nowrap>
+         <asp:Label ID="lbAuthRole" runat="server" Font-Bold="True" Text="��ɫ�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+           <asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text="��Ա�嵥"  /></td> 
+      <td style="width: 200px" nowrap><asp:Label ID="lbAuthEm" runat="server" Font-Bold="True" Text="��Ա�嵥"  /></td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top" >
+       <asp:ListBox id="listRoles" runat="server" width="120px" Height="360px" OnSelectedIndexChanged="listRoles_SelectedIndexChanged"  AutoPostBack="True">
+         </asp:ListBox></td>
+      <td valign ="top">
+      
+     
+     <asp:TreeView ID="treeAuth" runat="server" ShowLines="True"   ImageSet="Arrows" OnSelectedNodeChanged="treeAuth_SelectedNodeChanged" ShowCheckBoxes="All"  >
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+            <Nodes>
+<asp:TreeNode Text="" Selected="True" Value="0" Expanded="True"></asp:TreeNode>
+</Nodes>
+        </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          
+          <asp:gridview id="GvRole" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����"></asp:BoundField>
+                <asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����"></asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top">
+           
+           <asp:gridview id="GvEm" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+               <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField>
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+           
+                </columns>
+               <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+               <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+               <alternatingrowstyle cssclass="AlternatingItemStyle" />
+           </asp:gridview>
+         
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvAuthEm" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField>
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview></td>
+     </tr>
+     
+     
+     
+     </table>
+     
+     
+     
+     
+     
+     
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center" style="height: 27px"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                
+               &nbsp;&nbsp;
+                <asp:Label ID="lbmsg" runat="server"></asp:Label>
+                
+               </td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/RoleAuth.aspx.cs b/Dict/RoleAuth.aspx.cs
new file mode 100644
index 0000000..c821261
--- /dev/null
+++ b/Dict/RoleAuth.aspx.cs
@@ -0,0 +1,285 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class RoleAuth : PageBase
+{
+    private LRoleAuthority _logic;
+   
+    protected void Page_Load(object sender, EventArgs e)
+    {
+       
+       
+        if (!IsPostBack)
+        {
+            _logic = new LRoleAuthority();
+            Databound(); 
+            bindAuth();
+            bindRoles();
+           
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+
+         bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    /// <summary>
+    /// ��Ȩ��
+    /// </summary>
+    void bindAuth()
+    {
+        treeAuth.Nodes.Clear(); 
+        BindAuthTree("0", treeAuth.SelectedNode, _logic.QueryNonePublicAuthority().DefaultView);
+    }
+
+ 
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindRoles()
+    {
+        DataView dv = _logic.GetAllRoles().DefaultView;
+        dv.RowFilter = "role_4Approve =0";
+        listRoles.DataSource =dv;
+        listRoles.DataTextField = "role_name";
+        listRoles.DataValueField = "ID";
+        listRoles.DataBind();
+    }
+ 
+   
+
+    public void BindAuthTree(string id, TreeNode pNode, DataView  dv )
+    {
+
+        dv.RowFilter = "auth_uplevel = '" + id + "'";
+        foreach (DataRowView row in  dv)
+        {
+            TreeNode node = new TreeNode();
+            string authLink = row["auth_link"].ToString();
+            string authForm = row["auth_class"].ToString();
+            node.Value = row["ID"].ToString();
+            node.Expanded = true;
+            string authLevel = row["auth_uplevel"].ToString();
+           // if (authForm == string.Empty && (authLink == string.Empty || authLink.Trim().Length < 6)) //not *.aspx
+            if (authLevel.Equals("0"))
+            {
+                node.Text = "<strong>" + row["auth_name"] + "</strong>"; 
+                node.SelectAction = TreeNodeSelectAction.None;
+              //  node.ShowCheckBox = false;
+            }   else 
+ 
+            {
+                node.Text =   row["auth_name"].ToString()  ;
+
+            }
+           
+          
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                treeAuth.Nodes.Add(node);
+              
+
+            }
+            else
+            {
+                
+                pNode.ChildNodes.Add(node);
+ 
+            }
+            BindAuthTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRoleAuthority)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+ 
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        lbmsg.Text = " ";
+        if (listRoles.SelectedValue == string.Empty) return;
+        //��ɫ��Ȩ��
+        ArrayList al = new ArrayList();
+        GetCheckedNode(treeAuth.Nodes, al);
+        _logic.Initialize();
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                
+                _logic.GetRoleAuthority.Delete(Convert.ToInt32(listRoles.SelectedValue));
+                //   _logic.Initialize();
+                foreach (string id in al)
+                {
+                    _logic.GetRoleAuthority.ra_role = Convert.ToInt32(listRoles.SelectedValue);
+                    _logic.GetRoleAuthority.ra_authority = Convert.ToInt32(id);
+                    _logic.GetRoleAuthority.Add();
+                }
+                lbmsg.Text = "����ɹ���";
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣������ʧ�ܡ�");
+            }
+
+
+        }
+
+
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    { 
+       
+
+    }
+
+    void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        {
+            if (node.Checked)
+            {
+                checkedvalues.Add(node.Value);
+
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+        }
+      
+    }
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+       
+        btnSubmit.Enabled = true;
+        
+    }
+
+    private void ClearDetail()
+    { 
+       
+    }
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+
+        lbmsg.Text = " ";
+ /*
+        if (treeAuth.SelectedNode != null) treeAuth.SelectedNode.Selected = false;
+        lbAuthRole.Text = "Ȩ�޽�ɫ�嵥" ;
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+  */
+  
+  //--����Ȩ������ѡ��
+            ArrayList autList = new ArrayList();
+            DataView dv = _logic.GetRoleAuthority.QueryActived().Tables[0].DefaultView;
+            dv.RowFilter = "ra_role ='" + listRoles.SelectedValue + "'";
+            foreach (DataRowView drv in dv)
+            {
+                autList.Add(drv["ra_authority"]);
+            }
+            SetCheckedNode(treeAuth.Nodes, autList);
+
+       bindGV();
+
+    }
+   
+     
+    protected void treeAuth_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        bindGV();
+            
+    }
+
+    void bindGV()
+    { 
+        //��ɫ��Ӧ����Ա�嵥
+        if (listRoles.SelectedItem != null)
+        {
+
+            lbRoleEm.Text = listRoles.SelectedItem.Text + " ��ɫ��Ա�嵥";
+            GvEm.DataSource = _logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue));
+        }
+        GvEm.DataBind();
+         
+      
+        //Ȩ�޶�Ӧ�Ľ�ɫ,��Ա�嵥
+        if (treeAuth.SelectedNode != null) 
+        { 
+            lbAuthEm.Text = treeAuth.SelectedNode.Text + " Ȩ����Ա�嵥";
+            GvAuthEm.DataSource = _logic.GetEmListByAuth(Convert.ToInt32(treeAuth.SelectedValue));
+            lbAuthRole.Text =   treeAuth.SelectedNode.Text + " Ȩ�޽�ɫ�嵥";
+            GvRole.DataSource = _logic.GetRoleListByAuth(Convert.ToInt32(treeAuth.SelectedValue));
+            
+        }
+        GvAuthEm.DataBind();
+        GvRole.DataBind();
+    }
+ 
+}
\ No newline at end of file
diff --git a/Dict/RoleEmp.aspx b/Dict/RoleEmp.aspx
new file mode 100644
index 0000000..2296daf
--- /dev/null
+++ b/Dict/RoleEmp.aspx
@@ -0,0 +1,131 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleEmp.aspx.cs" Inherits="RoleEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table   class="Table_NoBorder" width="100%">
+  
+    <tr><td>
+     <table width="100%" class="Table_NoBorder" border="1">
+     <tr class="HeaderStyle">
+     <td  style="width: 120px" ><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="��ɫ�б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="��Ա�б�"  /></td>
+     <td style="width: 200px" nowrap>
+        ��<asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text=" "  /> 
+          <asp:Label ID="Label1" runat="server"  Text="��ɫ��Ա�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmRole" runat="server" Font-Bold="True" Text=""  />
+           <asp:Label ID="Label2" runat="server"  Text="��Ա��ɫ�嵥"  />
+         </td> 
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmAuth" runat="server" Font-Bold="True" Text="��ԱȨ���嵥"  />
+           <asp:Label ID="Label3" runat="server"  Text="��ԱȨ���嵥"  />
+         </td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top">
+         
+         <asp:ListBox id="listRoles" runat="server" width="120px" Height="360px"    OnSelectedIndexChanged="listRoles_SelectedIndexChanged" AutoPostBack="True">
+         </asp:ListBox></td>
+      <td valign ="top"> 
+       
+      
+      <asp:TreeView id="TreeDeptEmp" runat="server"  ShowLines="True" ImageSet="Arrows" 
+             ���� ShowCheckBoxes="All" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged"   >
+             
+             <nodes>
+<asp:TreeNode Text="WMS" Selected="True" Value="0" Expanded="True" SelectAction="None" ></asp:TreeNode>
+</nodes>
+  <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvEm" runat="server"   AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%">
+              <columns>
+                ��
+                <asp:BoundField DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"> <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField> 
+                <asp:BoundField DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"> 
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top" ><asp:gridview id="GvRole" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1">
+           <columns>
+                ��
+                <asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����"> <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                <asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����">  
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+           
+                </columns>
+           <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+           <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+           <alternatingrowstyle cssclass="AlternatingItemStyle" />
+       </asp:gridview></td>
+      <td valign ="top">
+           <asp:gridview id="GVauth" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1">
+              <columns>
+                ��
+                <asp:BoundField DataField="auth_name" SortExpression="auth_name" HeaderText="Ȩ������"> <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                <asp:BoundField DataField="auth_desc" SortExpression="auth_desc" HeaderText="Ȩ������"> 
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+           
+                </columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+          </asp:gridview>
+         
+     
+     </td>
+     </tr>
+     
+     
+     
+     </table>
+      
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+               &nbsp;&nbsp;
+                <asp:Label ID="lbmsg" runat="server"></asp:Label>
+              </td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/RoleEmp.aspx.cs b/Dict/RoleEmp.aspx.cs
new file mode 100644
index 0000000..822618c
--- /dev/null
+++ b/Dict/RoleEmp.aspx.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class RoleEmp : PageBase
+{
+    private LRoleAuthority _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LRoleAuthority();
+            Databound();  
+            bindRoles();
+            bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+    //    if (!isRoleAuth) bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeDeptEmp.Nodes.Clear();
+        BindTree("0", TreeDeptEmp.SelectedNode, new LEmployee().GetDepartments().DefaultView, new  LEmployee().GetActivedEmpDept().DefaultView);
+         
+         
+    }
+
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindRoles()
+    {
+   
+        listRoles.DataSource = _logic.GetAllRoles();
+        listRoles.DataTextField = "role_name";
+        listRoles.DataValueField = "ID";
+        listRoles.DataBind();
+    }
+ 
+    public void BindTree(string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["dep_name"] + "</em>" +" "+ row["ID"];
+            node.Value = row["ID"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+            empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  ,
+                        emrow["DE_EMPLOYEE"].ToString() + ";" + emrow["WAREHOUSE"].ToString()); 
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDeptEmp.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+ 
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRoleAuthority)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        lbmsg.Text = " ";
+        if (listRoles.SelectedValue == string.Empty) return;
+        ArrayList al = new ArrayList();
+
+        GetCheckedNode(TreeDeptEmp.Nodes, al);
+        _logic.Initialize();
+
+        try
+        {
+            using (TransactionScope trans = new TransactionScope())
+            {
+                int roleId = Convert.ToInt32(listRoles.SelectedValue);
+                _logic.GetRoleEmp.Delete(roleId);
+
+                foreach (string id in al)
+                {
+                    string[] ls= id.Split(';');
+                    _logic.GetRoleEmp.re_role = roleId;
+                    _logic.GetRoleEmp.re_employee =  Convert.ToInt32(ls[0]) ; 
+                    if (ls.Length > 1)
+                    {
+                        _logic.GetRoleEmp.warehouse = Convert.ToInt32(ls[1]);
+                    }
+                    _logic.GetRoleEmp.Add();
+                }
+
+                trans.Complete();
+            }
+            lbmsg.Text = "����ɹ�";
+        }
+        catch (MyException)
+        {
+            throw;
+        }
+        catch (Exception er)
+        {
+            throw new Exception("�����쳣������ʧ�ܡ�");
+        }
+
+
+        Databound();
+    }
+
+   
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+       
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        {
+            string[] ls = node.Value.Split(';');
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(ls[0])); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+
+    
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+       
+      
+        //--������Ա����ѡ��
+       /*
+        if (TreeDeptEmp.SelectedNode != null) TreeDeptEmp.SelectedNode.Selected = false;
+         
+        lbAuthRole.Text = "��Ա��ɫ�嵥";
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+        * */
+        //--ѡ����Ա����ѡ�� 
+        
+            ArrayList empList = new ArrayList(); 
+            DataTable  dt =_logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue))  ;
+            foreach (DataRow dr in dt.Rows) 
+            {
+                empList.Add(dr["ID"]);
+            }
+        SetCheckedNode(TreeDeptEmp.Nodes, empList);
+
+        bindGV();
+
+    }
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+
+        bindGV();
+       
+    }
+     
+   
+    void bindGV( )
+    {
+        //��Ա��ɫ��Ȩ���嵥
+        string nodevalue = TreeDeptEmp.SelectedValue;
+        nodevalue = nodevalue.Split(';')[0];
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {
+
+            lbEmRole.Text = TreeDeptEmp.SelectedNode.Text;// +" ��Ա��ɫ�嵥";
+          GvRole.DataSource = _logic.GetRoleByEm(Convert.ToInt32(nodevalue));
+
+          lbEmAuth.Text = TreeDeptEmp.SelectedNode.Text;// +" ��ԱȨ���嵥";
+         GVauth.DataSource = _logic.GetAuthByEm(Convert.ToInt32(nodevalue));
+        
+        }
+        GvRole.DataBind();
+        GVauth.DataBind();
+
+        //��ɫ��Ӧ����Ա�嵥
+        if (listRoles.SelectedItem != null)
+        {
+
+            lbRoleEm.Text = listRoles.SelectedItem.Text;// +" ��ɫ��Ա�嵥";
+            GvEm.DataSource = _logic.GetEmListByRole(Convert.ToInt32(listRoles.SelectedValue));
+        }
+        GvEm.DataBind();
+    }
+ 
+}
\ No newline at end of file
diff --git a/Dict/RoleMain.aspx b/Dict/RoleMain.aspx
new file mode 100644
index 0000000..c2d14a2
--- /dev/null
+++ b/Dict/RoleMain.aspx
@@ -0,0 +1,123 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="RoleMain.aspx.cs" Inherits="RoleMain" %>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ <%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    
+        <!------ THE DATA GRID AREA ------>
+     
+        <asp:gridview   id="GridView1"  CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        emptydatatext="û�����ݡ�" 
+
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" AutoGenerateColumns="False">
+						 
+            <Columns>
+<asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="��ɫid" visible="false"></asp:BoundField>
+<asp:BoundField DataField="ROLE_NAME" SortExpression="ROLE_NAME" HeaderText="��ɫ����">
+ <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+ <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+</asp:BoundField>
+
+<asp:BoundField DataField="ROLE_DESC" SortExpression="ROLE_DESC" HeaderText="��ɫ����"><ItemStyle Wrap="False" HorizontalAlign="Center"/>
+ <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+<asp:BoundField DataField="ROLE_4Approve" SortExpression="ROLE_4Approve" HeaderText="��˽�ɫ"><ItemStyle Wrap="False" HorizontalAlign="Center"/>
+ <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+<asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<EmptyDataTemplate>
+          
+        
+</EmptyDataTemplate> 
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            
+        </asp:gridview>
+        
+        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       </td></tr>
+    <tr><td class="ALine"  ></td>
+        </tr> 
+    <tr><td>
+    
+    
+        <!------ THE ADD /DELETE AREA ------>
+      
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+          <table class="Table_NoBorder" width="100%">
+			<tr><td align="right">
+               <asp:Label ID="Label2" runat="server" CssClass="Label"  Text="��ɫ����"></asp:Label></td><td  >
+              
+					<asp:TextBox ID="txtJobName" runat="server"  CssClass="TextBox" MaxLength="25"    ></asp:TextBox>
+                    
+                     
+                              <asp:RequiredFieldValidator id="RequiredFieldValidator4" runat="server" ControlToValidate="txtJobName"
+                                                ErrorMessage="�������ɫ���ơ�" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator>             
+                                            
+                                            
+                                                </td>
+			 
+			 <td  align="right">
+                 &nbsp;<asp:Label ID="Label3" runat="server" CssClass="Label"  Text="��ɫ����"></asp:Label></td><td  >
+                 &nbsp;<asp:TextBox ID="txtJobDesc" runat="server" CssClass="TextBox_Long" MaxLength="100" Width="255px"  ></asp:TextBox>
+                 
+                 
+                              <asp:RequiredFieldValidator id="RequiredFieldValidator5" runat="server" ControlToValidate="txtJobDesc"
+                                                ErrorMessage="�������ɫ������" SetFocusOnError="True" ValidationGroup="1">*</asp:RequiredFieldValidator>             
+                                            </td></tr>
+			<tr><td  align="right">
+                 <asp:Label ID="Label1" runat="server" CssClass="Label"  Text="��˽�ɫ" Visible="true"></asp:Label></td><td colspan ="3" >
+                     <asp:CheckBox id="chkApprove" runat="server">
+                     </asp:CheckBox></td></tr>
+			 
+		  <tr>
+                                        <td colspan="4"  >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                    <tr>
+            <tr>
+            <td  colspan ="4" class="ALine"  >
+            </td>
+            </tr>
+            </table>
+        
+              <!------ BUTTONS ------>
+            <table class="Table_NoBorder" width="80%"> 
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+               </td>
+            </tr>
+          </table>      
+            </asp:Panel>
+      
+      
+       
+      
+        </td></tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Dict/RoleMain.aspx.cs b/Dict/RoleMain.aspx.cs
new file mode 100644
index 0000000..2d90346
--- /dev/null
+++ b/Dict/RoleMain.aspx.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class RoleMain : PageBase
+{
+    private LRole _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+        if (!IsPostBack)
+        {
+            _logic = new LRole();
+            Databound();
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        GridView1.DataSource = _logic.GetAllActiveData().Tables[0];
+        GridView1.DataBind();
+        UpdateSession();
+        
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LRole)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        chkApprove.Checked=_logic.GetRole.role_4Approve ;
+        txtJobName.Text = _logic.GetRole.role_name;
+        txtJobDesc.Text = _logic.GetRole.role_desc;
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    { 
+        Databound();
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+        txtJobName.Focus();
+        GridView1.SelectedIndex = -1;��
+       
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind(); 
+        txtJobName.Focus();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+        if (txtJobDesc.Text.Trim().Length + txtJobName.Text.Trim().Length == 0)
+        {
+            txtJobName.Focus();
+            Databound();
+            DataDetail.Visible = true;
+             ScriptManager.RegisterStartupScript(btnSubmit, typeof(UpdatePanel), "alert",
+                                                  "alert('�������ɫ���ơ�');", true);
+            return;
+
+        }
+        int oper = 0;
+        oper = _logic.GetRole.ID > 0 ? _logic.GetRole.Update() : _logic.GetRole.Add();
+        ClearDetail();
+        Databound();
+      
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetRole.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        CheckBox chk;
+        if (e.Row.RowType == DataControlRowType.DataRow)
+        {
+            chk = new CheckBox();
+            chk.Text = "";
+            chk.Enabled = false;
+            chk.Checked = e.Row.Cells[3].Text.Trim().Equals("True");
+            e.Row.Cells[3].Controls.Add(chk);
+        }
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+      
+        string sortExpression = e.SortExpression;
+        if (GridView1.SortDirection == SortDirection.Ascending)                      //����������
+        {
+             
+            SortGridView(sortExpression, " DESC");
+        }
+        else
+         {
+             
+            SortGridView(sortExpression, " ASC");
+        }
+    }
+ private void SortGridView(string sortExpression, string direction)
+   {
+       DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+       dv.Sort = sortExpression + direction;
+       GridView1.DataSource = dv;                       //��DataView�󶨵�GridView��
+       GridView1.DataBind();
+
+    } 
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+       // if (_logic.GetRole.ID > 0) 
+     //    _logic.GetRole.lastmodified = DateTime.Now.ToString();
+     //   _logic.GetRole.dr = true;
+        _logic.GetRole.role_name = txtJobName.Text;
+        _logic.GetRole.role_desc = txtJobDesc.Text;
+        _logic.GetRole.role_4Approve = chkApprove.Checked;
+    }
+
+    private void chgOperTxt(bool addNew)
+    { 
+        btnSubmit.Enabled = true;
+         DataDetail.Visible = true;
+    }
+
+    private void ClearDetail()
+    {
+        chkApprove.Checked = false;��
+        txtJobName.Text = "";
+        txtJobDesc.Text = "";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+   
+}
\ No newline at end of file
diff --git a/FileNotFound.aspx b/FileNotFound.aspx
new file mode 100644
index 0000000..a2e8312
--- /dev/null
+++ b/FileNotFound.aspx
@@ -0,0 +1,24 @@
+<%@ Page Language="C#" MasterPageFile="masterPage.master" AutoEventWireup="true" CodeFile="FileNotFound.aspx.cs" Inherits="FileNotFound"  %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+     <table width="80%" class="Table_Border" align="center">
+        <tr>
+            <td   >
+                 <asp:Label ID="lbTitle" runat="server" ForeColor="Red" Text="������"></asp:Label> 
+            </td>
+            
+            </tr>
+            <tr>
+            <td>
+            <br />
+             <asp:Label ID="lbErrtrace" runat="server" ForeColor="Red" Height="130px" ></asp:Label>
+            </td>
+            </tr>
+           </table>
+   
+   
+   
+ 
+   
+
+</asp:Content>
+
diff --git a/FileNotFound.aspx.cs b/FileNotFound.aspx.cs
new file mode 100644
index 0000000..fa488cd
--- /dev/null
+++ b/FileNotFound.aspx.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using System.Text;
+public partial class FileNotFound : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      
+        lbErrtrace.Text =  "û�ҵ���Ҫ���ʵ��ļ���";
+
+    }
+}
diff --git a/Global.asax b/Global.asax
new file mode 100644
index 0000000..35a43a5
--- /dev/null
+++ b/Global.asax
@@ -0,0 +1,127 @@
+<%@ Application Language="C#" %>
+<%@ Import Namespace="view.App_Code"%>
+<%@ Import Namespace="DeiNiu.Utils"%>
+
+<script runat="server">
+
+    void Application_Start(object sender, EventArgs e) 
+    {
+        // Code that runs on application startup
+        Application["usercnt"] = 0;
+        Application["userlst"] =  new ArrayList();
+        
+
+          SessionEndModule.SessionObjectKey = "CurrentUserId";
+          SessionEndModule.SessionEnd += SessionTimoutModule_SessionEnd;
+    }
+    
+    void Application_End(object sender, EventArgs e) 
+    {
+        //  Code that runs on application shutdown
+        Application.Clear();
+
+    }
+
+    void Application_Error(object sender, EventArgs e)
+    {
+
+
+        
+        Exception objErr = Server.GetLastError().GetBaseException();
+        string error = "�����쳣ҳ: " + Request.Url.ToString() + "<br/>";
+        if (Request.Url.ToString().IndexOf("ShowError.aspx") > 0)  //����ѭ������
+        {
+            Server.ClearError();
+            return;  
+        }
+        error += "�쳣��Ϣ: " + objErr.Message + "<br/>";
+        error += objErr.StackTrace + "<br/>";
+        error += Request.Url.ToString() + "<br/>";
+        Server.ClearError();
+        Application["error"] = error;
+        Response.Redirect("~/ShowError.aspx");
+       
+        
+        /*
+        Exception ev = Server.GetLastError();
+        Server.ClearError();
+        StringBuilder strResponse = new StringBuilder();
+        myLog.RequestLog logobj = new myLog.RequestLog();
+        logobj.RecordExceptionLog(ev);
+
+        strResponse.Append(ev);
+
+        if (ev is MyException) strResponse.Append(((MyException)ev).ExtrMsg);
+        if (Session["currentSql"] != null)
+            strResponse.Append("<br/>referenced sql is:<br/>" + HttpContext.Current.Session["currentSql"]);
+        Session["ERROINFO"] = strResponse;
+        Response.Redirect("~/ShowError.aspx");
+      
+        if (ev.InnerException != null)
+        {
+
+            strResponse.Append(ev.InnerException.ToString().Trim());
+
+            if (ev is MyException) strResponse.Append(((MyException) ev).ExtrMsg);
+            if (Session["currentSql"] != null)
+                strResponse.Append("<br/>referenced sql is:<br/>" + HttpContext.Current.Session["currentSql"]);
+            Session["ERROINFO"] = strResponse;
+            Response.Redirect("~/ShowError.aspx");
+
+
+        }
+        else if (ev is HttpException)
+        {
+            ///  return;
+        }
+
+        else
+        {
+            Response.Redirect("~/fileNotFound.aspx");
+        }
+
+        */
+ 
+    }
+
+    void Session_Start(object sender, EventArgs e) 
+    {
+        // Code that runs when a new session is started
+        Session["CurrentUserId"] = "0";
+    }
+
+    void Session_End(object sender, EventArgs e) 
+    {
+        // Code that runs when a session ends. 
+        // Note: The Session_End event is raised only when the sessionstate mode
+        // is set to InProc in the Web.config file. If session mode is set to StateServer 
+        // or SQLServer, the event is not raised.
+        int cuid = Session["CurrentUserId"] == null ? 0 :Convert.ToInt32( Session["CurrentUserId"].ToString());
+        //if (Session["CurrentUserId"] != null && (string)Session["CurrentUserId"] != "0") 
+       if(cuid >0) 
+       {
+           ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+
+           DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+        logobj.LogoutLog(Convert.ToInt32( Session["CurrentUserId"].ToString()));
+        if (HttpContext.Current != null)
+        {
+            HttpContext.Current.Response.Redirect("~/index.aspx");
+        }
+            
+       }
+    }
+    private static void SessionTimoutModule_SessionEnd(object sender,SessionEndedEventArgs e)
+    {
+      ��
+
+        // This will be the value in the session for the key specified in Application_Start
+        object sessionObject = e.SessionObject; 
+        string val = (sessionObject == null) ? "[null]" : sessionObject.ToString();
+        if (val ==null || val == "0") return;
+
+        DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+        logobj.LogoutLog(val);
+        
+    } 
+</script>
diff --git a/Images/.svn/entries b/Images/.svn/entries
new file mode 100644
index 0000000..ecda76c
--- /dev/null
+++ b/Images/.svn/entries
@@ -0,0 +1,1728 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/Images
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+error2.gif
+file
+
+
+
+
+2011-04-01T02:51:07.367974Z
+331f6dfb37f8606d1f5d4d9f54d7bd77
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+394
+
+line_dot2.gif
+file
+
+
+
+
+2011-04-01T02:51:07.399224Z
+32e782320c2978ef31c9d7f97eac9969
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+50
+
+ancor1.gif
+file
+
+
+
+
+2011-04-01T02:51:07.430475Z
+43476573a379ab294307bfea1c825224
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+79
+
+UP.gif
+file
+
+
+
+
+2011-04-01T02:51:07.477350Z
+4b324d3859a23c34bf3a7e04977aaac9
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+156
+
+arr.gif
+file
+
+
+
+
+2011-04-01T02:51:07.508600Z
+2bc039efab8a7c1d7151d4901a1e2680
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+290
+
+bg.gif
+file
+
+
+
+
+2011-04-01T02:51:07.524225Z
+dceb13b61e4ac6092c1c38649c4af545
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+654
+
+button_100.gif
+file
+
+
+
+
+2011-04-01T02:51:07.571100Z
+98a1953d7dd65ddea4d8acef5a9aca2e
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+428
+
+t_below.gif
+file
+
+
+
+
+2011-04-01T02:51:07.602351Z
+f83d32ce6b3b18f4a24fd122df6afef0
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+117
+
+button_101.gif
+file
+
+
+
+
+2011-04-01T02:51:07.633601Z
+7256f1a7bb7719dad53705e3865631f9
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+405
+
+t_mid.gif
+file
+
+
+
+
+2011-04-01T02:51:07.649226Z
+7108534928254d097a3683558fe1c86d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+57
+
+button_120.gif
+file
+
+
+
+
+2011-04-01T02:51:07.664851Z
+5e97896e10cc4797757b89c5bf503762
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+448
+
+line_dot.gif
+file
+
+
+
+
+2011-04-01T02:51:07.696101Z
+ec2e787cc45417223316a2ea595d2800
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+61
+
+Navigate.gif
+file
+
+
+
+
+2011-04-01T02:51:07.711726Z
+abcd76e120bcdf149bdf808df9369e8a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+676
+
+save.gif
+file
+
+
+
+
+2011-04-01T02:51:07.727351Z
+a78daedd8be18da8776da19753b6bab0
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+165
+
+logo.gif
+file
+
+
+
+
+2011-04-01T02:51:07.758602Z
+436f2b063cf9e7745216ba31496c8aa7
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2041
+
+detail.gif
+file
+
+
+
+
+2011-04-01T02:51:07.821102Z
+146ea82d432d997c8641818cc8b13b51
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+590
+
+delete.GIF
+file
+
+
+
+
+2011-04-01T02:51:07.774227Z
+93e6220a4a80f61b6dde0597c82b7e49
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+587
+
+biaoqian_1.gif
+file
+
+
+
+
+2011-04-01T02:51:07.836727Z
+4b8969af1a185fa42c3858948f78036c
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1229
+
+biaoqian_2.gif
+file
+
+
+
+
+2011-04-01T02:51:07.867977Z
+3a80986a3ef87d97463be3653af30f2a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1320
+
+arr1.gif
+file
+
+
+
+
+2011-04-01T02:51:07.930478Z
+d8da9217bb4307fc98d39d251223ffe1
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+65
+
+undo.gif
+file
+
+
+
+
+2011-04-01T02:51:07.914853Z
+4e87a4414e536dac59a99e37572be748
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+125
+
+dot_green.gif
+file
+
+
+
+
+2011-04-01T02:51:07.977353Z
+28a8a4f6068b767712b468d142b21288
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+49
+
+Line_long.gif
+file
+
+
+
+
+2011-04-01T02:51:07.946103Z
+acc3a1008706fe8c910b7e29da90a6e4
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+511
+
+DOWN.gif
+file
+
+
+
+
+2011-04-01T02:51:08.024228Z
+114620ea4346993e08e109fd4bd4d354
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+158
+
+help.png
+file
+
+
+
+
+2011-04-01T02:51:07.992978Z
+2dba7cc177725ec730a552c4d20cddb1
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+669
+
+active.gif
+file
+
+
+
+
+2011-04-01T02:51:08.055479Z
+2f1a87bacbb060961c56952828e222a1
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+240
+
+m_top.gif
+file
+
+
+
+
+2011-04-01T02:51:08.086729Z
+33f469dfb6bc203532fd365a2c384a77
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1362
+
+bg_SelectedItem.gif
+file
+
+
+
+
+2011-04-01T02:51:08.164854Z
+f04aa22dc8a2f16e8e3e278cc7f5494d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+142
+
+expand.gif
+file
+
+
+
+
+2011-04-01T02:51:08.102354Z
+34aa8c06f280791d3ab86e9bd74085e7
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+336
+
+find.gif
+file
+
+
+
+
+2011-04-01T02:51:08.196104Z
+e8a95dc02e1692c40508f19adfeabbff
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+158
+
+update.gif
+file
+
+
+
+
+2011-04-01T02:51:08.227355Z
+a78daedd8be18da8776da19753b6bab0
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+165
+
+bg_news.gif
+file
+
+
+
+
+2011-04-01T02:51:08.258605Z
+95e70bdac148542b0ea40a03f009a742
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+588
+
+edit.gif
+file
+
+
+
+
+2011-04-01T02:51:08.305480Z
+07c50963d50f87d694f56e2c48f8bbfc
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+248
+
+t_top.gif
+file
+
+
+
+
+2011-04-01T02:51:08.321105Z
+786c492269c69dc04898cca31a8b9b16
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+117
+
+dot.gif
+file
+
+
+
+
+2011-04-01T02:51:08.367981Z
+aa02b3e0c1dbcbe2dee8d3e16402275a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+67
+
+bg_top_tit.gif
+file
+
+
+
+
+2011-04-01T02:51:08.399231Z
+06bf7f949c2aebff619c187f51ec4577
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+144
+
+left.gif
+file
+
+
+
+
+2011-04-01T02:51:08.430481Z
+7771cfbfa1ced337a279c2be4ceadccf
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12336
+
+button_150.gif
+file
+
+
+
+
+2011-04-01T02:51:08.461731Z
+f2876b13946fa7461a56d88bb1c8b07f
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+490
+
+1.gif
+file
+
+
+
+
+2011-04-01T02:51:08.477356Z
+ed280a0ea3cc38f3cbbc747acfbef47d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+49
+
+collapse.gif
+file
+
+
+
+
+2011-04-01T02:51:08.492981Z
+f86a052c4705b9679c2e822cb85b7cc4
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+344
+
+bg_left.gif
+file
+
+
+
+
+2011-04-01T02:51:08.508606Z
+9d556f748707fe8985356503e0ea442d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+60
+
+head11.gif
+file
+
+
+
+
+2011-04-01T02:51:08.539857Z
+ab541a2732f46d53105dae7ddf7c1c46
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+22738
+
+Search.gif
+file
+
+
+
+
+2011-04-01T02:51:08.555482Z
+6383a6bee4020788c8757ced23e79961
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+561
+
+End.GIF
+file
+
+
+
+
+2011-04-01T02:51:08.571107Z
+af22e95be6df00749d31d78ce84d7a13
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+210
+
+cross.png
+file
+
+
+
+
+2011-04-01T02:51:08.586732Z
+42492684e24356a4081134894eabeb9e
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+655
+
+calendar.gif
+file
+
+
+
+
+2011-04-01T02:51:08.602357Z
+c50738cb7e92f4868e37cc478e0e0154
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+162
+
+Tabstrip1.gif
+file
+
+
+
+
+2011-04-01T02:51:08.617982Z
+d8ee1a1069cb5a09b3c721187c52f841
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+473
+
+tick.png
+file
+
+
+
+
+2011-04-01T02:51:08.633607Z
+93b0e63a528104e30a8c29c6768d4390
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+467
+
+Tabstrip2.gif
+file
+
+
+
+
+2011-04-01T02:51:08.649232Z
+7589520ae3f72b8b317c76f4d1a500fc
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1742
+
+error1.gif
+file
+
+
+
+
+2011-04-01T02:51:08.680483Z
+dcd08857d902b3c02d89057257472622
+2011-03-31T02:53:16.230701Z
+2
+mwang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9257
+
diff --git a/Images/.svn/prop-base/1.gif.svn-base b/Images/.svn/prop-base/1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/DOWN.gif.svn-base b/Images/.svn/prop-base/DOWN.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/DOWN.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/End.GIF.svn-base b/Images/.svn/prop-base/End.GIF.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/End.GIF.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/Line_long.gif.svn-base b/Images/.svn/prop-base/Line_long.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/Line_long.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/Navigate.gif.svn-base b/Images/.svn/prop-base/Navigate.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/Navigate.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/Search.gif.svn-base b/Images/.svn/prop-base/Search.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/Search.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/Tabstrip1.gif.svn-base b/Images/.svn/prop-base/Tabstrip1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/Tabstrip1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/Tabstrip2.gif.svn-base b/Images/.svn/prop-base/Tabstrip2.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/Tabstrip2.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/UP.gif.svn-base b/Images/.svn/prop-base/UP.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/UP.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/active.gif.svn-base b/Images/.svn/prop-base/active.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/active.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/ancor1.gif.svn-base b/Images/.svn/prop-base/ancor1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/ancor1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/arr.gif.svn-base b/Images/.svn/prop-base/arr.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/arr.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/arr1.gif.svn-base b/Images/.svn/prop-base/arr1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/arr1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/bg.gif.svn-base b/Images/.svn/prop-base/bg.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/bg.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/bg_SelectedItem.gif.svn-base b/Images/.svn/prop-base/bg_SelectedItem.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/bg_SelectedItem.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/bg_left.gif.svn-base b/Images/.svn/prop-base/bg_left.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/bg_left.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/bg_news.gif.svn-base b/Images/.svn/prop-base/bg_news.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/bg_news.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/bg_top_tit.gif.svn-base b/Images/.svn/prop-base/bg_top_tit.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/bg_top_tit.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/biaoqian_1.gif.svn-base b/Images/.svn/prop-base/biaoqian_1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/biaoqian_1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/biaoqian_2.gif.svn-base b/Images/.svn/prop-base/biaoqian_2.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/biaoqian_2.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/button_100.gif.svn-base b/Images/.svn/prop-base/button_100.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/button_100.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/button_101.gif.svn-base b/Images/.svn/prop-base/button_101.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/button_101.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/button_120.gif.svn-base b/Images/.svn/prop-base/button_120.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/button_120.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/button_150.gif.svn-base b/Images/.svn/prop-base/button_150.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/button_150.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/calendar.gif.svn-base b/Images/.svn/prop-base/calendar.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/calendar.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/collapse.gif.svn-base b/Images/.svn/prop-base/collapse.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/collapse.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/cross.png.svn-base b/Images/.svn/prop-base/cross.png.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/cross.png.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/delete.GIF.svn-base b/Images/.svn/prop-base/delete.GIF.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/delete.GIF.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/detail.gif.svn-base b/Images/.svn/prop-base/detail.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/detail.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/dot.gif.svn-base b/Images/.svn/prop-base/dot.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/dot.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/dot_green.gif.svn-base b/Images/.svn/prop-base/dot_green.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/dot_green.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/edit.gif.svn-base b/Images/.svn/prop-base/edit.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/edit.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/error1.gif.svn-base b/Images/.svn/prop-base/error1.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/error1.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/error2.gif.svn-base b/Images/.svn/prop-base/error2.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/error2.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/expand.gif.svn-base b/Images/.svn/prop-base/expand.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/expand.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/find.gif.svn-base b/Images/.svn/prop-base/find.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/find.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/head11.gif.svn-base b/Images/.svn/prop-base/head11.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/head11.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/help.png.svn-base b/Images/.svn/prop-base/help.png.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/help.png.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/left.gif.svn-base b/Images/.svn/prop-base/left.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/left.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/line_dot.gif.svn-base b/Images/.svn/prop-base/line_dot.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/line_dot.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/line_dot2.gif.svn-base b/Images/.svn/prop-base/line_dot2.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/line_dot2.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/logo.gif.svn-base b/Images/.svn/prop-base/logo.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/logo.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/m_top.gif.svn-base b/Images/.svn/prop-base/m_top.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/m_top.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/save.gif.svn-base b/Images/.svn/prop-base/save.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/save.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/t_below.gif.svn-base b/Images/.svn/prop-base/t_below.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/t_below.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/t_mid.gif.svn-base b/Images/.svn/prop-base/t_mid.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/t_mid.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/t_top.gif.svn-base b/Images/.svn/prop-base/t_top.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/t_top.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/tick.png.svn-base b/Images/.svn/prop-base/tick.png.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/tick.png.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/undo.gif.svn-base b/Images/.svn/prop-base/undo.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/undo.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/prop-base/update.gif.svn-base b/Images/.svn/prop-base/update.gif.svn-base
new file mode 100644
index 0000000..5e9587e
--- /dev/null
+++ b/Images/.svn/prop-base/update.gif.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/Images/.svn/text-base/1.gif.svn-base b/Images/.svn/text-base/1.gif.svn-base
new file mode 100644
index 0000000..c95709f
Binary files /dev/null and b/Images/.svn/text-base/1.gif.svn-base differ
diff --git a/Images/.svn/text-base/DOWN.gif.svn-base b/Images/.svn/text-base/DOWN.gif.svn-base
new file mode 100644
index 0000000..71cddd6
Binary files /dev/null and b/Images/.svn/text-base/DOWN.gif.svn-base differ
diff --git a/Images/.svn/text-base/End.GIF.svn-base b/Images/.svn/text-base/End.GIF.svn-base
new file mode 100644
index 0000000..cca4d1b
Binary files /dev/null and b/Images/.svn/text-base/End.GIF.svn-base differ
diff --git a/Images/.svn/text-base/Line_long.gif.svn-base b/Images/.svn/text-base/Line_long.gif.svn-base
new file mode 100644
index 0000000..1073884
Binary files /dev/null and b/Images/.svn/text-base/Line_long.gif.svn-base differ
diff --git a/Images/.svn/text-base/Navigate.gif.svn-base b/Images/.svn/text-base/Navigate.gif.svn-base
new file mode 100644
index 0000000..b976bcf
Binary files /dev/null and b/Images/.svn/text-base/Navigate.gif.svn-base differ
diff --git a/Images/.svn/text-base/Search.gif.svn-base b/Images/.svn/text-base/Search.gif.svn-base
new file mode 100644
index 0000000..7ab14b3
Binary files /dev/null and b/Images/.svn/text-base/Search.gif.svn-base differ
diff --git a/Images/.svn/text-base/Tabstrip1.gif.svn-base b/Images/.svn/text-base/Tabstrip1.gif.svn-base
new file mode 100644
index 0000000..acb2132
Binary files /dev/null and b/Images/.svn/text-base/Tabstrip1.gif.svn-base differ
diff --git a/Images/.svn/text-base/Tabstrip2.gif.svn-base b/Images/.svn/text-base/Tabstrip2.gif.svn-base
new file mode 100644
index 0000000..98b5fce
Binary files /dev/null and b/Images/.svn/text-base/Tabstrip2.gif.svn-base differ
diff --git a/Images/.svn/text-base/UP.gif.svn-base b/Images/.svn/text-base/UP.gif.svn-base
new file mode 100644
index 0000000..3a6ea16
Binary files /dev/null and b/Images/.svn/text-base/UP.gif.svn-base differ
diff --git a/Images/.svn/text-base/active.gif.svn-base b/Images/.svn/text-base/active.gif.svn-base
new file mode 100644
index 0000000..33785ba
Binary files /dev/null and b/Images/.svn/text-base/active.gif.svn-base differ
diff --git a/Images/.svn/text-base/ancor1.gif.svn-base b/Images/.svn/text-base/ancor1.gif.svn-base
new file mode 100644
index 0000000..38df00d
Binary files /dev/null and b/Images/.svn/text-base/ancor1.gif.svn-base differ
diff --git a/Images/.svn/text-base/arr.gif.svn-base b/Images/.svn/text-base/arr.gif.svn-base
new file mode 100644
index 0000000..b15f158
Binary files /dev/null and b/Images/.svn/text-base/arr.gif.svn-base differ
diff --git a/Images/.svn/text-base/arr1.gif.svn-base b/Images/.svn/text-base/arr1.gif.svn-base
new file mode 100644
index 0000000..b533bf1
Binary files /dev/null and b/Images/.svn/text-base/arr1.gif.svn-base differ
diff --git a/Images/.svn/text-base/bg.gif.svn-base b/Images/.svn/text-base/bg.gif.svn-base
new file mode 100644
index 0000000..1fc00d3
Binary files /dev/null and b/Images/.svn/text-base/bg.gif.svn-base differ
diff --git a/Images/.svn/text-base/bg_SelectedItem.gif.svn-base b/Images/.svn/text-base/bg_SelectedItem.gif.svn-base
new file mode 100644
index 0000000..515b635
Binary files /dev/null and b/Images/.svn/text-base/bg_SelectedItem.gif.svn-base differ
diff --git a/Images/.svn/text-base/bg_left.gif.svn-base b/Images/.svn/text-base/bg_left.gif.svn-base
new file mode 100644
index 0000000..6f28e61
Binary files /dev/null and b/Images/.svn/text-base/bg_left.gif.svn-base differ
diff --git a/Images/.svn/text-base/bg_news.gif.svn-base b/Images/.svn/text-base/bg_news.gif.svn-base
new file mode 100644
index 0000000..3df1bf7
Binary files /dev/null and b/Images/.svn/text-base/bg_news.gif.svn-base differ
diff --git a/Images/.svn/text-base/bg_top_tit.gif.svn-base b/Images/.svn/text-base/bg_top_tit.gif.svn-base
new file mode 100644
index 0000000..852c0ff
Binary files /dev/null and b/Images/.svn/text-base/bg_top_tit.gif.svn-base differ
diff --git a/Images/.svn/text-base/biaoqian_1.gif.svn-base b/Images/.svn/text-base/biaoqian_1.gif.svn-base
new file mode 100644
index 0000000..f4964df
Binary files /dev/null and b/Images/.svn/text-base/biaoqian_1.gif.svn-base differ
diff --git a/Images/.svn/text-base/biaoqian_2.gif.svn-base b/Images/.svn/text-base/biaoqian_2.gif.svn-base
new file mode 100644
index 0000000..e7f535a
Binary files /dev/null and b/Images/.svn/text-base/biaoqian_2.gif.svn-base differ
diff --git a/Images/.svn/text-base/button_100.gif.svn-base b/Images/.svn/text-base/button_100.gif.svn-base
new file mode 100644
index 0000000..8c57211
Binary files /dev/null and b/Images/.svn/text-base/button_100.gif.svn-base differ
diff --git a/Images/.svn/text-base/button_101.gif.svn-base b/Images/.svn/text-base/button_101.gif.svn-base
new file mode 100644
index 0000000..7620237
Binary files /dev/null and b/Images/.svn/text-base/button_101.gif.svn-base differ
diff --git a/Images/.svn/text-base/button_120.gif.svn-base b/Images/.svn/text-base/button_120.gif.svn-base
new file mode 100644
index 0000000..f29b731
Binary files /dev/null and b/Images/.svn/text-base/button_120.gif.svn-base differ
diff --git a/Images/.svn/text-base/button_150.gif.svn-base b/Images/.svn/text-base/button_150.gif.svn-base
new file mode 100644
index 0000000..5e5bf43
Binary files /dev/null and b/Images/.svn/text-base/button_150.gif.svn-base differ
diff --git a/Images/.svn/text-base/calendar.gif.svn-base b/Images/.svn/text-base/calendar.gif.svn-base
new file mode 100644
index 0000000..4ebebba
Binary files /dev/null and b/Images/.svn/text-base/calendar.gif.svn-base differ
diff --git a/Images/.svn/text-base/collapse.gif.svn-base b/Images/.svn/text-base/collapse.gif.svn-base
new file mode 100644
index 0000000..9dd7622
Binary files /dev/null and b/Images/.svn/text-base/collapse.gif.svn-base differ
diff --git a/Images/.svn/text-base/cross.png.svn-base b/Images/.svn/text-base/cross.png.svn-base
new file mode 100644
index 0000000..1514d51
Binary files /dev/null and b/Images/.svn/text-base/cross.png.svn-base differ
diff --git a/Images/.svn/text-base/delete.GIF.svn-base b/Images/.svn/text-base/delete.GIF.svn-base
new file mode 100644
index 0000000..a493cb7
Binary files /dev/null and b/Images/.svn/text-base/delete.GIF.svn-base differ
diff --git a/Images/.svn/text-base/detail.gif.svn-base b/Images/.svn/text-base/detail.gif.svn-base
new file mode 100644
index 0000000..b8bd043
Binary files /dev/null and b/Images/.svn/text-base/detail.gif.svn-base differ
diff --git a/Images/.svn/text-base/dot.gif.svn-base b/Images/.svn/text-base/dot.gif.svn-base
new file mode 100644
index 0000000..8404e07
Binary files /dev/null and b/Images/.svn/text-base/dot.gif.svn-base differ
diff --git a/Images/.svn/text-base/dot_green.gif.svn-base b/Images/.svn/text-base/dot_green.gif.svn-base
new file mode 100644
index 0000000..63cc646
Binary files /dev/null and b/Images/.svn/text-base/dot_green.gif.svn-base differ
diff --git a/Images/.svn/text-base/edit.gif.svn-base b/Images/.svn/text-base/edit.gif.svn-base
new file mode 100644
index 0000000..55f291c
Binary files /dev/null and b/Images/.svn/text-base/edit.gif.svn-base differ
diff --git a/Images/.svn/text-base/error1.gif.svn-base b/Images/.svn/text-base/error1.gif.svn-base
new file mode 100644
index 0000000..408fd0f
Binary files /dev/null and b/Images/.svn/text-base/error1.gif.svn-base differ
diff --git a/Images/.svn/text-base/error2.gif.svn-base b/Images/.svn/text-base/error2.gif.svn-base
new file mode 100644
index 0000000..c45af2b
Binary files /dev/null and b/Images/.svn/text-base/error2.gif.svn-base differ
diff --git a/Images/.svn/text-base/expand.gif.svn-base b/Images/.svn/text-base/expand.gif.svn-base
new file mode 100644
index 0000000..bcf0a80
Binary files /dev/null and b/Images/.svn/text-base/expand.gif.svn-base differ
diff --git a/Images/.svn/text-base/find.gif.svn-base b/Images/.svn/text-base/find.gif.svn-base
new file mode 100644
index 0000000..ffc070d
Binary files /dev/null and b/Images/.svn/text-base/find.gif.svn-base differ
diff --git a/Images/.svn/text-base/head11.gif.svn-base b/Images/.svn/text-base/head11.gif.svn-base
new file mode 100644
index 0000000..cf1911f
Binary files /dev/null and b/Images/.svn/text-base/head11.gif.svn-base differ
diff --git a/Images/.svn/text-base/help.png.svn-base b/Images/.svn/text-base/help.png.svn-base
new file mode 100644
index 0000000..eb3d885
Binary files /dev/null and b/Images/.svn/text-base/help.png.svn-base differ
diff --git a/Images/.svn/text-base/left.gif.svn-base b/Images/.svn/text-base/left.gif.svn-base
new file mode 100644
index 0000000..7bc762a
Binary files /dev/null and b/Images/.svn/text-base/left.gif.svn-base differ
diff --git a/Images/.svn/text-base/line_dot.gif.svn-base b/Images/.svn/text-base/line_dot.gif.svn-base
new file mode 100644
index 0000000..65a0072
Binary files /dev/null and b/Images/.svn/text-base/line_dot.gif.svn-base differ
diff --git a/Images/.svn/text-base/line_dot2.gif.svn-base b/Images/.svn/text-base/line_dot2.gif.svn-base
new file mode 100644
index 0000000..b3b7ca8
Binary files /dev/null and b/Images/.svn/text-base/line_dot2.gif.svn-base differ
diff --git a/Images/.svn/text-base/logo.gif.svn-base b/Images/.svn/text-base/logo.gif.svn-base
new file mode 100644
index 0000000..f70be2a
Binary files /dev/null and b/Images/.svn/text-base/logo.gif.svn-base differ
diff --git a/Images/.svn/text-base/m_top.gif.svn-base b/Images/.svn/text-base/m_top.gif.svn-base
new file mode 100644
index 0000000..3d16554
Binary files /dev/null and b/Images/.svn/text-base/m_top.gif.svn-base differ
diff --git a/Images/.svn/text-base/save.gif.svn-base b/Images/.svn/text-base/save.gif.svn-base
new file mode 100644
index 0000000..fde7924
Binary files /dev/null and b/Images/.svn/text-base/save.gif.svn-base differ
diff --git a/Images/.svn/text-base/t_below.gif.svn-base b/Images/.svn/text-base/t_below.gif.svn-base
new file mode 100644
index 0000000..4d12a01
Binary files /dev/null and b/Images/.svn/text-base/t_below.gif.svn-base differ
diff --git a/Images/.svn/text-base/t_mid.gif.svn-base b/Images/.svn/text-base/t_mid.gif.svn-base
new file mode 100644
index 0000000..49ce826
Binary files /dev/null and b/Images/.svn/text-base/t_mid.gif.svn-base differ
diff --git a/Images/.svn/text-base/t_top.gif.svn-base b/Images/.svn/text-base/t_top.gif.svn-base
new file mode 100644
index 0000000..1654869
Binary files /dev/null and b/Images/.svn/text-base/t_top.gif.svn-base differ
diff --git a/Images/.svn/text-base/tick.png.svn-base b/Images/.svn/text-base/tick.png.svn-base
new file mode 100644
index 0000000..dd94984
Binary files /dev/null and b/Images/.svn/text-base/tick.png.svn-base differ
diff --git a/Images/.svn/text-base/undo.gif.svn-base b/Images/.svn/text-base/undo.gif.svn-base
new file mode 100644
index 0000000..879f9ef
Binary files /dev/null and b/Images/.svn/text-base/undo.gif.svn-base differ
diff --git a/Images/.svn/text-base/update.gif.svn-base b/Images/.svn/text-base/update.gif.svn-base
new file mode 100644
index 0000000..fde7924
Binary files /dev/null and b/Images/.svn/text-base/update.gif.svn-base differ
diff --git a/Images/1.gif b/Images/1.gif
new file mode 100644
index 0000000..c95709f
Binary files /dev/null and b/Images/1.gif differ
diff --git a/Images/DOWN.gif b/Images/DOWN.gif
new file mode 100644
index 0000000..71cddd6
Binary files /dev/null and b/Images/DOWN.gif differ
diff --git a/Images/End.GIF b/Images/End.GIF
new file mode 100644
index 0000000..cca4d1b
Binary files /dev/null and b/Images/End.GIF differ
diff --git a/Images/Line_long.gif b/Images/Line_long.gif
new file mode 100644
index 0000000..1073884
Binary files /dev/null and b/Images/Line_long.gif differ
diff --git a/Images/Navigate.gif b/Images/Navigate.gif
new file mode 100644
index 0000000..b976bcf
Binary files /dev/null and b/Images/Navigate.gif differ
diff --git a/Images/Search.gif b/Images/Search.gif
new file mode 100644
index 0000000..7ab14b3
Binary files /dev/null and b/Images/Search.gif differ
diff --git a/Images/Tabstrip1.gif b/Images/Tabstrip1.gif
new file mode 100644
index 0000000..acb2132
Binary files /dev/null and b/Images/Tabstrip1.gif differ
diff --git a/Images/Tabstrip2.gif b/Images/Tabstrip2.gif
new file mode 100644
index 0000000..98b5fce
Binary files /dev/null and b/Images/Tabstrip2.gif differ
diff --git a/Images/UP.gif b/Images/UP.gif
new file mode 100644
index 0000000..3a6ea16
Binary files /dev/null and b/Images/UP.gif differ
diff --git a/Images/active.gif b/Images/active.gif
new file mode 100644
index 0000000..33785ba
Binary files /dev/null and b/Images/active.gif differ
diff --git a/Images/ancor1.gif b/Images/ancor1.gif
new file mode 100644
index 0000000..38df00d
Binary files /dev/null and b/Images/ancor1.gif differ
diff --git a/Images/arr.gif b/Images/arr.gif
new file mode 100644
index 0000000..b15f158
Binary files /dev/null and b/Images/arr.gif differ
diff --git a/Images/arr1.gif b/Images/arr1.gif
new file mode 100644
index 0000000..b533bf1
Binary files /dev/null and b/Images/arr1.gif differ
diff --git a/Images/bg.gif b/Images/bg.gif
new file mode 100644
index 0000000..1fc00d3
Binary files /dev/null and b/Images/bg.gif differ
diff --git a/Images/bg_SelectedItem.gif b/Images/bg_SelectedItem.gif
new file mode 100644
index 0000000..515b635
Binary files /dev/null and b/Images/bg_SelectedItem.gif differ
diff --git a/Images/bg_left.gif b/Images/bg_left.gif
new file mode 100644
index 0000000..6f28e61
Binary files /dev/null and b/Images/bg_left.gif differ
diff --git a/Images/bg_news.gif b/Images/bg_news.gif
new file mode 100644
index 0000000..3df1bf7
Binary files /dev/null and b/Images/bg_news.gif differ
diff --git a/Images/bg_top_tit.gif b/Images/bg_top_tit.gif
new file mode 100644
index 0000000..852c0ff
Binary files /dev/null and b/Images/bg_top_tit.gif differ
diff --git a/Images/biaoqian_1.gif b/Images/biaoqian_1.gif
new file mode 100644
index 0000000..f4964df
Binary files /dev/null and b/Images/biaoqian_1.gif differ
diff --git a/Images/biaoqian_2.gif b/Images/biaoqian_2.gif
new file mode 100644
index 0000000..e7f535a
Binary files /dev/null and b/Images/biaoqian_2.gif differ
diff --git a/Images/btnFirst.Image.png b/Images/btnFirst.Image.png
new file mode 100644
index 0000000..8d7c4fc
Binary files /dev/null and b/Images/btnFirst.Image.png differ
diff --git a/Images/btnLast.Image.png b/Images/btnLast.Image.png
new file mode 100644
index 0000000..06858cb
Binary files /dev/null and b/Images/btnLast.Image.png differ
diff --git a/Images/btnNext.Image.png b/Images/btnNext.Image.png
new file mode 100644
index 0000000..5b7c53d
Binary files /dev/null and b/Images/btnNext.Image.png differ
diff --git a/Images/btnPrev.Image.png b/Images/btnPrev.Image.png
new file mode 100644
index 0000000..1c0001a
Binary files /dev/null and b/Images/btnPrev.Image.png differ
diff --git a/Images/button_100.gif b/Images/button_100.gif
new file mode 100644
index 0000000..8c57211
Binary files /dev/null and b/Images/button_100.gif differ
diff --git a/Images/button_101.gif b/Images/button_101.gif
new file mode 100644
index 0000000..7620237
Binary files /dev/null and b/Images/button_101.gif differ
diff --git a/Images/button_120.gif b/Images/button_120.gif
new file mode 100644
index 0000000..f29b731
Binary files /dev/null and b/Images/button_120.gif differ
diff --git a/Images/button_150.gif b/Images/button_150.gif
new file mode 100644
index 0000000..5e5bf43
Binary files /dev/null and b/Images/button_150.gif differ
diff --git a/Images/calendar.gif b/Images/calendar.gif
new file mode 100644
index 0000000..4ebebba
Binary files /dev/null and b/Images/calendar.gif differ
diff --git a/Images/collapse.gif b/Images/collapse.gif
new file mode 100644
index 0000000..9dd7622
Binary files /dev/null and b/Images/collapse.gif differ
diff --git a/Images/cross.png b/Images/cross.png
new file mode 100644
index 0000000..1514d51
Binary files /dev/null and b/Images/cross.png differ
diff --git a/Images/delete.GIF b/Images/delete.GIF
new file mode 100644
index 0000000..a493cb7
Binary files /dev/null and b/Images/delete.GIF differ
diff --git a/Images/detail.gif b/Images/detail.gif
new file mode 100644
index 0000000..b8bd043
Binary files /dev/null and b/Images/detail.gif differ
diff --git a/Images/dot.gif b/Images/dot.gif
new file mode 100644
index 0000000..8404e07
Binary files /dev/null and b/Images/dot.gif differ
diff --git a/Images/dot_green.gif b/Images/dot_green.gif
new file mode 100644
index 0000000..63cc646
Binary files /dev/null and b/Images/dot_green.gif differ
diff --git a/Images/edit.gif b/Images/edit.gif
new file mode 100644
index 0000000..55f291c
Binary files /dev/null and b/Images/edit.gif differ
diff --git a/Images/error1.gif b/Images/error1.gif
new file mode 100644
index 0000000..408fd0f
Binary files /dev/null and b/Images/error1.gif differ
diff --git a/Images/error2.gif b/Images/error2.gif
new file mode 100644
index 0000000..c45af2b
Binary files /dev/null and b/Images/error2.gif differ
diff --git a/Images/expand.gif b/Images/expand.gif
new file mode 100644
index 0000000..bcf0a80
Binary files /dev/null and b/Images/expand.gif differ
diff --git a/Images/find.gif b/Images/find.gif
new file mode 100644
index 0000000..ffc070d
Binary files /dev/null and b/Images/find.gif differ
diff --git a/Images/head11.gif b/Images/head11.gif
new file mode 100644
index 0000000..cf1911f
Binary files /dev/null and b/Images/head11.gif differ
diff --git a/Images/help.png b/Images/help.png
new file mode 100644
index 0000000..eb3d885
Binary files /dev/null and b/Images/help.png differ
diff --git a/Images/left.gif b/Images/left.gif
new file mode 100644
index 0000000..7bc762a
Binary files /dev/null and b/Images/left.gif differ
diff --git a/Images/line_dot.gif b/Images/line_dot.gif
new file mode 100644
index 0000000..65a0072
Binary files /dev/null and b/Images/line_dot.gif differ
diff --git a/Images/line_dot2.gif b/Images/line_dot2.gif
new file mode 100644
index 0000000..b3b7ca8
Binary files /dev/null and b/Images/line_dot2.gif differ
diff --git a/Images/logo.gif b/Images/logo.gif
new file mode 100644
index 0000000..f70be2a
Binary files /dev/null and b/Images/logo.gif differ
diff --git a/Images/m_top.gif b/Images/m_top.gif
new file mode 100644
index 0000000..3d16554
Binary files /dev/null and b/Images/m_top.gif differ
diff --git a/Images/save.gif b/Images/save.gif
new file mode 100644
index 0000000..fde7924
Binary files /dev/null and b/Images/save.gif differ
diff --git a/Images/t_below.gif b/Images/t_below.gif
new file mode 100644
index 0000000..4d12a01
Binary files /dev/null and b/Images/t_below.gif differ
diff --git a/Images/t_mid.gif b/Images/t_mid.gif
new file mode 100644
index 0000000..49ce826
Binary files /dev/null and b/Images/t_mid.gif differ
diff --git a/Images/t_top.gif b/Images/t_top.gif
new file mode 100644
index 0000000..1654869
Binary files /dev/null and b/Images/t_top.gif differ
diff --git a/Images/tick.png b/Images/tick.png
new file mode 100644
index 0000000..dd94984
Binary files /dev/null and b/Images/tick.png differ
diff --git a/Images/undo.gif b/Images/undo.gif
new file mode 100644
index 0000000..879f9ef
Binary files /dev/null and b/Images/undo.gif differ
diff --git a/Images/update.gif b/Images/update.gif
new file mode 100644
index 0000000..fde7924
Binary files /dev/null and b/Images/update.gif differ
diff --git a/Project/.svn/entries b/Project/.svn/entries
new file mode 100644
index 0000000..4bf5426
--- /dev/null
+++ b/Project/.svn/entries
@@ -0,0 +1,708 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/Project
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T06:56:19.747664Z
+8
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+WorkPlanMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.852365Z
+e1358884635a6bd226bc06ab378d19b5
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6888
+
+ProjectMain.aspx.bak
+file
+
+
+
+
+2011-04-01T02:51:09.883615Z
+98905de18fa6bc4f9e3e99bc1a45b4b4
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+44582
+
+ProjectCenter.aspx
+file
+
+
+
+
+2011-04-01T02:51:09.867990Z
+874a6a4851fa3cc24cf8ec148fae311f
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+44364
+
+ProjectApprove.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.867990Z
+f6be8ba18052bbc1bbe3fa6789e28e24
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+32563
+
+ProjectApprove.aspx.csb
+file
+
+
+
+
+2011-04-01T02:51:09.883615Z
+8220fc078f2c3e38ae26e78c973eb7e3
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+29496
+
+ProjectsQuery.aspx.bak
+file
+
+
+
+
+2011-04-01T02:51:09.914865Z
+5682cba62b5ef5e0e0d09f8f5cbe7b68
+2011-03-31T06:10:11.232039Z
+7
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10982
+
+ProjectMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:09.899240Z
+882fedc23cc447cf93e88823f4f47028
+2011-03-31T06:10:11.232039Z
+7
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+44622
+
+ProjectCenter.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.899240Z
+d06fd643f3de795e3c8021269b702337
+2011-03-31T05:34:41.698027Z
+4
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+38411
+
+WorkReport.aspx
+file
+
+
+
+
+2011-04-01T02:51:09.930491Z
+e3d1837aab60809ed17fe4adb40e8a60
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6097
+
+ProjectsQuery.aspx
+file
+
+
+
+
+2011-04-01T02:51:09.946116Z
+5138b93349fa909414ac79b0caa0fc7e
+2011-03-31T06:56:19.747664Z
+8
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11075
+
+ProjectMain.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.930491Z
+f817081f0b2059d7219b86768c4fc8e4
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+41694
+
+WorkReport.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.946116Z
+f8e568034e0de71887c04162359cdd32
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5920
+
+ProjectsQuery.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:09.961741Z
+0a57280859321377ea6730f4fc30a604
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8552
+
+复件 ProjectApprove.aspxpu
+file
+
+
+
+
+2011-04-01T02:51:09.961741Z
+d989dae083b09438d7da8285344e0d7e
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+26890
+
+复件 ProjectApprove.aspx.cspu
+file
+
+
+
+
+2011-04-01T02:51:09.977366Z
+069fb1ead17ff6ec6a7d688c03a4a6ce
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+31530
+
+ProjectApprove.aspx.bak
+file
+
+
+
+
+2011-04-01T02:51:09.977366Z
+dd3d73943e4b7c25323ddfc7e57985cf
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27905
+
+WorkPlanMain.aspx
+file
+
+
+
+
+2011-04-01T02:51:10.008616Z
+a374b50d1bf8aae0ae98eb8bd65294d8
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5649
+
+ProjectApprove.aspx.cs.bak
+file
+
+
+
+
+2011-04-01T02:51:10.024241Z
+8a03b375376cc68cbc6ccb61de35fc00
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+32561
+
+ProjectApprove.aspx
+file
+
+
+
+
+2011-04-01T02:51:10.024241Z
+fd8aee7ed43de0794f3e677528f00159
+2011-03-31T06:10:11.232039Z
+7
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27941
+
+ProjectApprove.aspxa
+file
+
+
+
+
+2011-04-01T02:51:10.039866Z
+0a2e85ebfb34425f3e8c7cda901a2f49
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+26493
+
diff --git a/Project/.svn/text-base/ProjectApprove.aspx.bak.svn-base b/Project/.svn/text-base/ProjectApprove.aspx.bak.svn-base
new file mode 100644
index 0000000..fd2194d
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspx.bak.svn-base
@@ -0,0 +1,456 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="80%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+              <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+            </td>
+        </tr>
+           <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            </table>
+            <table width="75%" align="left">
+                 <div runat="server" id="ProjectDetail" visible="false" align="left"  >
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                   <asp:Label ID="lbapprovelst" runat="server" CssClass="Label" Text="������¼"></asp:Label>  </td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="90%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                  <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="true">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"  CausesValidation="True"     Width="1px" Text=1 visible="true"></asp:TextBox>
+                        <cc1:NumericUpDownExtender ID="NumericUpDownExtender2" runat="server" Width="80" Step="0.1" 
+                                TargetControlID="txtApproveScore">
+                            </cc1:NumericUpDownExtender> 
+                            
+                         <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtApproveScore"
+                                                            ErrorMessage="ϵ����Χ����0-1������" MaximumValue="1" MinimumValue="0"
+                                                             SetFocusOnError="True" ValidationGroup="1" Type="Double">*</asp:RangeValidator>
+                        </td>
+                </tr>
+                  
+                                         <tr>
+                                        <td  colspan=2 >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary> 
+                                        </td>
+                                        </tr>
+                                    
+                
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                   </div>
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectApprove.aspx.cs.bak.svn-base b/Project/.svn/text-base/ProjectApprove.aspx.cs.bak.svn-base
new file mode 100644
index 0000000..347cc9b
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspx.cs.bak.svn-base
@@ -0,0 +1,851 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "PK_DEPARTMENT";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.EndsWith("δͨ��"));
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+//            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;   //2011.3.14 ��������ͨ��--���ѷ���״̬�� �൱�ڴ�xsl load.
+                //_logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+              
+                _logic.GetProject.Update();
+                 _logic.GetProject.balanceThePercent(); //do the percent balance
+                 _logic.GetProject.getModel();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);           
+       //     _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+       //     _logic.PaObj.pa_score = Convert.ToDecimal(txtSystemScore.Text) * Convert.ToDecimal(txtApproveScore.Text);
+            _logic.PaObj.pa_score = Convert.ToDecimal(txtApproveScore.Text) ;
+            if (_logic.GetProject.pj_nextDept == -1)
+            {
+                 _logic.GetProject.pj_score =_logic.GetProject.pj_score * _logic.PaObj.pa_score ;
+            }
+
+            
+        }
+
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+ //               trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+      
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectApprove.aspx.cs.svn-base b/Project/.svn/text-base/ProjectApprove.aspx.cs.svn-base
new file mode 100644
index 0000000..da9789d
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspx.cs.svn-base
@@ -0,0 +1,851 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "PK_DEPARTMENT";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.EndsWith("δͨ��"));
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+//            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;   //2011.3.14 ��������ͨ��--���ѷ���״̬�� �൱�ڴ�xsl load.
+                //_logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+              
+                _logic.GetProject.Update();
+                 _logic.GetProject.balanceThePercent(); //do the percent balance
+                 _logic.GetProject.getModel();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+              //  _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);           
+       //     _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+       //     _logic.PaObj.pa_score = Convert.ToDecimal(txtSystemScore.Text) * Convert.ToDecimal(txtApproveScore.Text);
+            _logic.PaObj.pa_score = Convert.ToDecimal(txtApproveScore.Text) ;
+            if (_logic.GetProject.pj_nextDept == -1)
+            {
+                 _logic.GetProject.pj_score =_logic.GetProject.pj_score * _logic.PaObj.pa_score ;
+            }
+
+            
+        }
+
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+ //               trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+      
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectApprove.aspx.csb.svn-base b/Project/.svn/text-base/ProjectApprove.aspx.csb.svn-base
new file mode 100644
index 0000000..12eb1a4
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspx.csb.svn-base
@@ -0,0 +1,785 @@
+using System;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "PK_DEPARTMENT";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+ //           using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+              //      _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+                {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);
+            _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+            
+        }
+
+ //       using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+   
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectApprove.aspx.svn-base b/Project/.svn/text-base/ProjectApprove.aspx.svn-base
new file mode 100644
index 0000000..17b588f
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspx.svn-base
@@ -0,0 +1,457 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="80%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"
+                                    	 ><ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+              <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+            </td>
+        </tr>
+           <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            </table>
+            <table width="75%" align="left">
+                 <div runat="server" id="ProjectDetail" visible="false" align="left"  >
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                   <asp:Label ID="lbapprovelst" runat="server" CssClass="Label" Text="������¼"></asp:Label>  </td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="90%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                  <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="true">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"  CausesValidation="True"     Width="1px" Text=1 visible="true"></asp:TextBox>
+                        <cc1:NumericUpDownExtender ID="NumericUpDownExtender2" runat="server" Width="80" Step="0.1" 
+                                TargetControlID="txtApproveScore">
+                            </cc1:NumericUpDownExtender> 
+                            
+                         <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtApproveScore"
+                                                            ErrorMessage="ϵ����Χ����0-1������" MaximumValue="1" MinimumValue="0"
+                                                             SetFocusOnError="True" ValidationGroup="1" Type="Double">*</asp:RangeValidator>
+                        </td>
+                </tr>
+                  
+                                         <tr>
+                                        <td  colspan=2 >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary> 
+                                        </td>
+                                        </tr>
+                                    
+                
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                   </div>
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectApprove.aspxa.svn-base b/Project/.svn/text-base/ProjectApprove.aspxa.svn-base
new file mode 100644
index 0000000..d452b51
--- /dev/null
+++ b/Project/.svn/text-base/ProjectApprove.aspxa.svn-base
@@ -0,0 +1,436 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+                <!------ THE ADD /DELETE AREA ------>
+                <!------ THE ADD /DELETE AREA ------>
+            </td>
+        </tr>
+        <div runat="server" id="ProjectDetail" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                    ������¼</td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="3"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="4" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="false">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"
+                            Width="54px" visible="false">
+                        </asp:TextBox></td>
+                </tr>
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                    <!--input type="button" id="Button1" onClick="reset()" visible="false" class="Button"	value="ȡ���޸�" name="ButtonCancel"/-->
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectCenter.aspx.cs.svn-base b/Project/.svn/text-base/ProjectCenter.aspx.cs.svn-base
new file mode 100644
index 0000000..dd45d93
--- /dev/null
+++ b/Project/.svn/text-base/ProjectCenter.aspx.cs.svn-base
@@ -0,0 +1,1017 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectCenter :  PageBase
+    {
+        private LProject _logic;
+    
+  
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+
+            }
+            SessionSeting();
+
+          
+
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+    
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource =  getProjects();
+            GridView1.DataBind();
+            UpdateSession();
+           
+           // ProjectDataBind();
+         //   ProjectDetailDataBind();
+            //    btnSubmit.Enabled = false;
+           ClearProjDetailData();
+           ClearProjData();
+            intializeProjectMasterDept();
+        }
+
+    /// <summary>
+    /// ��������ȡ��Ӧ����Ŀ��Ϣ
+    /// </summary>
+    /// <returns></returns>
+     DataView  getProjects()
+       {
+           if (TreeDeptEmp.Nodes.Count == 0) return new DataView();
+           DataView dv = _logic.GetProjectsByYearMonth( btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        string selectDept = string.Empty;
+        string selectEmp = string.Empty;
+        string inputProjectName = string.Empty;
+        string rowFilter = string.Empty;
+
+
+       
+
+         if(rdlstAssignQry.SelectedValue=="0")  //all assigned and unassigned
+         {
+             
+              //�趨Ա���Ͳ�������
+           if( TreeDeptEmp.SelectedNode != null)
+             if(TreeDeptEmp.SelectedNode.Text.StartsWith(".")) //employee
+             {
+                 rowFilter = "pj_master = " + TreeDeptEmp.SelectedValue;
+             }
+             else
+             {
+                 rowFilter = "pj_dept =" + TreeDeptEmp.SelectedValue;
+             }
+
+        }
+         else
+         {
+             if (rdlstAssignQry.SelectedValue == "1") //assigned 
+                 rowFilter = "pj_status ='" + ProjectStatus.��Ŀ�ѷ��� +"'";
+             else
+                 rowFilter = "pj_status ='" + ProjectStatus.��Ŀδ���� +"'";
+         }
+
+             //�趨��Ŀ���ƹ���
+             if(txtQryProjectName.Text.Trim().Length>0)
+             {
+                 if(rowFilter.Length>0)
+                 {
+                     rowFilter += " and ";
+
+                 }
+                 
+             rowFilter += " pj_name like '%" + txtQryProjectName.Text.Trim() + "%'";
+                  
+             }
+
+
+        dv.RowFilter = rowFilter;
+           return dv;
+       }
+
+      
+
+
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+         
+        void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            intializeProjectMasterDept();
+           bindDeptEmp();
+           validDeptEmp();
+        }
+
+      void validDeptEmp()
+      {
+          if(lem.CanManageProjects) return;
+         
+      }
+
+    
+
+      void intializeProjectMasterDept()
+      {
+          txtProjMaster.Text = "";
+          drplstProjDept.Items.Clear();
+          if (TreeDeptEmp.SelectedValue == "0") return;
+          if (TreeDeptEmp.SelectedNode != null)
+              if (TreeDeptEmp.SelectedNode.Text.StartsWith(".")) //employee
+              {
+                  LEmployee tmp = new LEmployee();
+                  tmp.Initialize(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+                  drplstProjDept.DataSource = tmp.GetEmployee.GetDepartments();
+                  drplstProjDept.DataTextField = "DEP_NAME";
+                  drplstProjDept.DataValueField = "PK_DEPARTMENT";
+                  drplstProjDept.DataBind();
+
+                  txtProjMaster.Text = TreeDeptEmp.SelectedNode.Text.Substring(1).Replace("<strong>","").Replace("</strong>",string.Empty);  
+              }
+              else
+              {
+                  string dept = TreeDeptEmp.SelectedNode.Text.Substring(4);
+                   dept = dept.Substring(0, dept.Length -5);
+                  drplstProjDept.Items.Add(new ListItem(dept,TreeDeptEmp.SelectedNode.Value)); 
+              }
+      }
+
+    /// <summary>
+        /// �󶨲��ż��û�
+        /// </summary>
+        private void bindDeptEmp()
+        {
+            TreeDeptEmp.Nodes.Clear();
+            if (lem.CanManageProjects) //ӵ�й�����Ŀ�Ľ�ɫ����Կ���������Ŀ
+                BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode, lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+ 
+            else
+                 BindEmpTree(TreeDeptEmp, PublicUtils.buildWhereIntIn(lem.GetCanApproveDeptList()), TreeDeptEmp.SelectedNode, lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+
+        if (TreeDeptEmp.Nodes.Count >0) TreeDeptEmp.Nodes[0].Selected = true;
+        }
+
+
+
+        public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv, DataView empdv)
+        {
+            if (lem.CanManageProjects)
+            {
+                deptdv.RowFilter = "dep_mastdept in (" + id + ")";
+            }
+            else
+            {
+                if (id == string.Empty) return;
+                deptdv.RowFilter = "dep_mastdept in (" + id + ")";
+
+                if (pNode == null)
+                    deptdv.RowFilter = "pk_department in (" + id + ")";
+            }
+
+
+            foreach (DataRowView row in deptdv)
+            {
+                TreeNode node = new TreeNode();
+                node.Text = "<em>" + row["dep_name"] + "</em>";
+                node.Value = row["pk_department"].ToString(); 
+                node.ShowCheckBox = false;
+                node.Expanded = false;
+                empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode(".<strong>" + emrow["em_name"].ToString() +"</strong>" , emrow["pk_employee"].ToString());
+                    node.ChildNodes.Add(tnEmp);
+                }
+                if (pNode == null)
+                //˵���Ǹ��ڵ�
+                { 
+                    tree.Nodes.Add(node); 
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                
+                BindEmpTree(tree,  node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+            }
+        }
+
+
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                //           _logic = (LEmployee)Session[appScope.PagelevelObj];
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+//        Session[appScope.PagelevelObj] = _logic;
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+          //  txtProjMaster.Text = lem.GetEmployee.em_name;
+           txtProjPercent.Text = _logic.GetProject.pj_percent.ToString() ;
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+
+            ApproveListBind(_logic.GetProject.ID);
+
+            
+           
+        }
+    void ApproveListBind(int id)
+    {
+        RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+        RepeaterApproveList.DataBind();
+        panelApprovelist.Visible = true;
+    }
+        /// <summary>
+        /// ҳ�����Ŀ������Ϣ������Ϣ�ش�����Ŀʵ��
+        ///  
+        /// </summary>
+        void SetProjectDataBack()
+        {
+
+            if (_logic.GetProject.ID > 0)
+            {
+                _logic.GetProject.lastmodified = DateTime.Now.ToString();
+
+            } 
+
+            //    ProjectDetail.Visible = true;
+            _logic.GetProject.pj_name  = txtProjectName.Text;
+            _logic.GetProject.pj_planStartDate =  drpdProjlisFromYear.SelectedValue +"-" + drplstProjFromMonth.SelectedValue +"-01"; 
+            _logic.GetProject.pj_planEndDate = drplstProjectToYear.SelectedValue +"-" + drlstProjToMonth.SelectedValue +"-01";
+            _logic.GetProject.pj_master = lem.GetEmployee.ID;
+            _logic.GetProject.pj_mem =txtPrjDesc.Text;
+            //   _logic.GetProject.pj_progress  =   Convert.ToInt32(txtProjProgress.Text)  ;  //��Ŀ����
+            _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text) ;               //��ĿȨ��
+            _logic.GetProject.pj_type = drplstProjType.SelectedValue;
+            _logic.GetProject.pj_status =   ProjectStatus.����δ�ύ;
+            _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+            _logic.GetProject.pj_dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment( _logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if(dep.GetDepartment.dep_mastdept==0) //û���ϼ�����
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                }
+            }
+            _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text);
+            lbuploadmessage.Text = "";
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+            btnSubmit.Visible = true;
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+           
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+            btnSubmit.Visible = false;
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            panelApprovelist.Visible = false;
+           
+          
+        }
+
+
+        private void SetProjectDetailBack()
+        {
+            if (_logic.GetProjectDetail.ID > 0)
+            {
+                _logic.GetProjectDetail.lastmodified = DateTime.Now.ToString();
+
+            } 
+ 
+            _logic.GetProject.pj_progress = Convert.ToInt32(txtPrjProgress.Text) ;
+            _logic.GetProject.pj_finishDate =txtPdActualEndDate.Text  ;
+            _logic.GetProjectDetail.pd_planTarget =txtPdPlanTarget.Text  ;
+            _logic.GetProjectDetail.pd_finishedTarget = txtPdFinishTarget.Text  ;
+            _logic.GetProjectDetail.pd_percent =Convert.ToInt32(txtPdPercent.Text)  ;
+            _logic.GetProjectDetail.pd_mem =txtPdMem.Text ;
+            //����ʱstatusĬ��Ϊ��δ�ύ��
+            lbuploadmessage.Text = "";
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            ClearProjData();
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            validProjControles();
+            intializeProjectMasterDept();
+            lbuploadmessage.Text = "";
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+        /// <summary>
+        /// ������Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnProjSubmit_Click(object sender, EventArgs e)
+        {
+          
+            //�����Ŀ״̬��û�б仯���仯���������档
+           if(!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����) )
+           {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "�Ѿ������䣬�������޸ģ�����ʧ�ܡ�');", true);
+              return;
+           }
+           
+            
+                LProject lp = new LProject();
+                lp.GetProject.ID =_logic.GetProject.ID;
+                lp.GetProject.getModel();
+                if(!lp.GetProject.pj_status.Equals(_logic.GetProject.pj_status))
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('������������Ŀ  " + _logic.GetProject.pj_name + "�Ѿ��������޸ģ�����ʧ�ܡ�');", true);
+                    _logic.Initialize(_logic.GetProject.ID);
+                    Databound();
+                    ProjectDataBind();
+                    return;
+                }
+            
+             SetProjectDataBack(); 
+            if (_logic.GetProject.ID > 0) _logic.UpdateProject(); else _logic.AddProject();
+            ClearProjData();
+            Databound();
+        
+        }
+
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+        {
+            /*
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.ID = e.Row.Cells[0].Text.Trim();
+                string pdstatus = e.Row.Cells[13].Text.Trim();
+                chk.Enabled = (pdstatus == ProjectDetailStatus.�¶�δ�ύ || pdstatus == ProjectDetailStatus.����δͨ�� ||
+                               pdstatus == ProjectDetailStatus.���δͨ�� || pdstatus == ProjectDetailStatus.Ԥ��δͨ��);
+                e.Row.Cells[1].Controls.Add(chk);
+            }
+            */
+        }
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnReset_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+
+        /// <summary>
+        /// delete the project and details
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����))
+                {
+
+                    _logic.GetProject.Delete();
+                }
+            }
+
+            Databound();
+             
+        }
+
+        /***************************************** internal methods ********************************************/
+ 
+
+        private void chgOperTxt(bool addNew)
+        {
+         
+          
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+            btnSaveNewProj.Enabled = false;
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+            panelApprovelist.Visible = false;
+
+            drplstProjDept.Items.Clear();
+            lbuploadmessage.Text = "";
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+           if(drdlst.SelectedIndex>=0) 
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+           // btnSaveNewProj.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+           // btnDelete.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+            validProjControles();
+            btnSubmit.Visible = false;
+      
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            validPdControles();
+        }
+    void validProjControles()
+    {
+        divEditProject.Visible = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����)  ; 
+        txtProjectName.ReadOnly =!divEditProject.Visible;
+        drpdProjlisFromYear.Enabled = divEditProject.Visible;
+        drplstProjFromMonth.Enabled = divEditProject.Visible;
+        drplstProjectToYear.Enabled = divEditProject.Visible;
+        drlstProjToMonth.Enabled = divEditProject.Visible;
+        drplstProjType.Enabled = divEditProject.Visible;
+        txtPrjDesc.ReadOnly =!divEditProject.Visible;
+        txtProjProgress.ReadOnly =!divEditProject.Visible; //��Ŀ����
+        txtProjPercent.ReadOnly =!divEditProject.Visible; //��ĿȨ��
+        SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+        txtProjMem4delete.ReadOnly =!divEditProject.Visible; //����δ�ύ;
+        //  lbprjmem4Delete.Visible = divEditProject.Visible;
+        drplstProjDept.Enabled = divEditProject.Visible;
+        txtProjMaster.ReadOnly =!divEditProject.Visible;
+    }
+    void validPdControles()
+    {
+    //--monthly detail.
+        projMonthDetailEdit.Visible =  false;
+        txtPdName.ReadOnly =!projMonthDetailEdit.Visible;
+        txtPdStartDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdEndDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPrjProgress.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdActualEndDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdPlanTarget.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdFinishTarget.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdPercent.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdMem.ReadOnly =! projMonthDetailEdit.Visible ;
+         
+      
+
+    }
+
+
+        /// <summary>
+        /// project detail 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            SetProjectDetailBack();
+           
+            _logic.GetProjectDetail.Update();
+            ClearProjDetailData();
+            Databound();
+        }
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        
+
+        protected void btnToApprove_Click(object sender, EventArgs e)
+        {
+       //       _logic.GetProject.ID = Convert.ToInt32(GridView1.Rows[1].Cells[0].Text.Trim());
+
+
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if(  _logic.GetProject.pj_status.EndsWith("δ�ύ")||  _logic.GetProject.pj_status.EndsWith("δͨ��") )
+                {
+                    _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                    //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                    {
+                        _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                        if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                            _logic.GetProject.Update();
+                            continue; //�����쵼��������
+                        }
+                    }
+                    //����������ύ�������쵼��׼
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                    _logic.GetProject.Update();
+                }
+            }
+             
+            Databound();
+
+
+        }
+
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void btnpdToApprove_Click(object sender, EventArgs e)
+    {
+
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��"))
+            {
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                {
+                    _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                    if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                    {
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��; 
+                        _logic.GetProject.Update();
+                        _logic.GetProjectDetail.Update();
+                        continue;  //�����쵼��������
+                    }
+                }
+                //����������ύ�������쵼��׼
+                _logic.GetProject.Update();
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                _logic.GetProjectDetail.Update();
+            }
+        }
+
+        Databound();
+
+    }
+    protected void btnpd2approve_Click(object sender, EventArgs e)
+    {
+
+    }
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        intializeProjectMasterDept();
+        Databound();
+    }
+    protected void btnQuery_Click(object sender, EventArgs e)
+    {
+        Databound();
+    }
+    protected void btnAssign_Click(object sender, EventArgs e)
+    {
+
+        if (TreeDeptEmp.SelectedNode == null || TreeDeptEmp.SelectedNode != null && TreeDeptEmp.SelectedValue == "0" || TreeDeptEmp.SelectedNode.Parent.Value=="0")
+        {
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��ѡ���������Ŀ�������ˡ�');", true);
+            return;
+        } 
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����) )
+            {
+               
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;
+                _logic.GetProject.pj_master = Convert.ToInt32(TreeDeptEmp.SelectedValue);
+                _logic.GetProject.pj_dept = Convert.ToInt32(TreeDeptEmp.SelectedNode.Parent.Value);
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+
+
+    }
+    protected void btnUnAssign_Click(object sender, EventArgs e)
+    {
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����))
+            {
+
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ����; 
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+    }
+  
+    protected void btnFileUpload1_Click(object sender, EventArgs e)
+    {
+        const string projectDest = "~/upload/projects/";
+        if (fileUpload1.FileName.Length==0) return;
+        lbuploadmessage.Text = "";
+        DirectoryInfo dir = new DirectoryInfo(Server.MapPath(projectDest));
+        if (!dir.Exists)
+            dir.Create();
+        string fileSavePath = Server.MapPath(projectDest + fileUpload1.FileName);
+        fileUpload1.SaveAs(fileSavePath);
+     //   Master.ScriptMgr.EnablePartialRendering = true;
+       // pdUpload.Visible = false;
+
+
+
+        importProjects(fileSavePath);
+        lbuploadmessage.Text = "�ϴ��ɹ���";
+        Databound();
+        
+        System.IO.File.Delete(fileSavePath);
+
+    }
+
+    void importProjects(string fileName)
+    {
+            int Count = 1;
+            string tableName = string.Empty;
+        try
+        { 
+            
+        DataSet ds = PublicUtils.Excel2DataSet(fileName);
+        foreach (DataTable dt in ds.Tables)
+        {
+
+            Count = 1;
+            tableName = dt.TableName;
+            foreach (DataRow dr in dt.Rows)
+            {
+                Count++; 
+                _logic.Initialize();
+                if (dr["���Ŵ���"].ToString().Length>0)
+                _logic.GetProject.pj_dept = Convert.ToInt32(dr["���Ŵ���"].ToString());
+                 if (dr["��Ա���"].ToString().Length > 0)
+                _logic.GetProject.pj_master = Convert.ToInt32(dr["��Ա���"].ToString());
+                  _logic.GetProject.pj_mem = dr["��Ŀ����"].ToString().Substring(0,500);
+                _logic.GetProject.pj_name = dr["��Ŀ����"].ToString().Substring(0,50);
+                if (dr["��ĿȨ��"].ToString().Length > 0)
+                _logic.GetProject.pj_percent = Convert.ToInt32(dr["��ĿȨ��"].ToString());
+                _logic.GetProject.pj_type = dr["��Ŀ����"].ToString();
+                _logic.GetProject.pj_nextDept =-1; //��������
+                if (_logic.GetProject.pj_master >0) _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;
+                else
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+
+                _logic.GetProject.pj_planStartDate = dr["��Ŀ��ʼ���"].ToString().Trim()  + "-" + dr["��Ŀ��ʼ�·�"].ToString().Trim()  + "-01";
+                _logic.GetProject.pj_planEndDate = _logic.GetProject.pj_planStartDate;
+               
+                Convert.ToDateTime(_logic.GetProject.pj_planStartDate).AddMonths(Convert.ToInt32(dr["��ĿȨ��"].ToString()));
+                _logic.AddProject(); 
+            }
+        }
+
+        }
+        catch (Exception )
+        {
+            string errorMsg = "����  " + tableName +"�� "+ Count  +" ���д��󣬼����������ԡ�";
+            lbuploadmessage.Text = lbuploadmessage.Text + errorMsg;
+            throw;
+        //    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('"+ errorMsg+"');", true);
+          
+             
+        }
+       
+
+
+    }
+
+
+   
+    
+    protected void btnActive_Click(object sender, EventArgs e)
+    {
+     foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ�ⶳ))
+            {
+
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ⶳ;
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+        //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    protected void Page_Init()
+    {
+ ������
+     //   PostBackTrigger trigger = new PostBackTrigger();
+    //   trigger.ControlID = Button1.UniqueID;
+    //    ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+
+    void page_init()
+    {
+       ��Master.ScriptMgr.EnablePartialRendering = false;
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+    }
+
+
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectCenter.aspx.svn-base b/Project/.svn/text-base/ProjectCenter.aspx.svn-base
new file mode 100644
index 0000000..b986c47
--- /dev/null
+++ b/Project/.svn/text-base/ProjectCenter.aspx.svn-base
@@ -0,0 +1,524 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectCenter.aspx.cs" Inherits="ProjectCenter" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td>
+              <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td>
+                            <table border="0">
+                                <tr>
+                                    <td valign="top">
+                                        <asp:TreeView id="TreeDeptEmp" runat="server" ShowLines="True" ImageSet="Arrows"
+                                            OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged">
+                                            <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                                            <nodes>
+                                    <asp:TreeNode Text="������" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+                                  </nodes>
+                                        </asp:TreeView></td>
+                                        <td width="1" class="VLine" ></td>
+                                    <td valign="top">
+                                        <table border="0" width="100%">
+                                            <tr>
+                                                <td>
+                                                    <table class="Table_NoBorder" border="0"  width="100%">
+                                                        <tr>
+                                                            <td>
+                                                                <asp:Label ID="Label121" runat="server" CssClass="Label" Text="��Ŀ���ƹ���"></asp:Label>
+                                                            </td>
+                                                            <td>
+                                                                <asp:TextBox ID="txtQryProjectName" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                    Width="245px"></asp:TextBox>
+                                                            </td>
+                                                            <td>
+                                                                <asp:Label ID="Label122" runat="server" CssClass="Label" Text="����״̬ѡ��" visible=false></asp:Label>
+                                                            </td>
+                                                            <td nowrap>
+                                                                <asp:RadioButtonList id="rdlstAssignQry" runat="server" RepeatDirection="Horizontal" visible=false>
+                                                                    <asp:ListItem Value="0" selected="True">ȫ��</asp:ListItem>
+                                                                    <asp:ListItem Value="1">�ѷ���</asp:ListItem>
+                                                                    <asp:ListItem Value="-1">���</asp:ListItem>
+                                                                </asp:RadioButtonList>
+                                                            </td>
+                                                            <td>
+                                                                <asp:Button ID="btnQuery" runat="server" CssClass="Button" Text="��ѯ" OnClick="btnQuery_Click" />
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td colspan="5">
+                                                                <asp:GridView id="GridView1" CssClass="DataGrid" PageSize="20" PagerStyle-HorizontalAlign="Right"
+                                                                    runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                                                    AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                                                    OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                                                    Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                                                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                                                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                                                                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                                                                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                                                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid" Visible="false" >  </asp:BoundField>
+		                                                      
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�鿴" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  title= ��Ŀ��Ϣ &gt;" 
+				��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=������Ϣ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />                </asp:CommandField>
+			</columns>
+                                                                    <pagerstyle horizontalalign="Right" />
+                                                                </asp:GridView> <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+                                                                
+                                                                     
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        
+                                    <table>
+                                       <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" width="100%">
+                                            <table width="90%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="474px"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="True">0</asp:TextBox>
+                                                                    %&nbsp;
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="True">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="true">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px">
+                                                                    </asp:TextBox>
+                                                                    %</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td style="height: 45px">
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;
+                                                    </td>
+                                                    <td>
+                                                        &nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server">
+                                                        </asp:TextBox>
+                                                        %
+                                                    </td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                            runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                            Width="70%" ShowFooter="True" AutoGenerateColumns="False">
+                                                            <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr" HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowDeleteButton="False" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�鿴">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                                                            <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                                            <emptydatatemplate> û������</emptydatatemplate>
+                                                            <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                                            <pagerstyle horizontalalign="Right" />
+                                                            <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                                            <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                                        </asp:GridView></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" align="center">
+                                                        <div runat="server" id="projMonthDetailEdit">
+                                                            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                                                            <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater id="RepeaterApproveList" runat="server">
+                                                        <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td>ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                 
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                                    </table>
+                                        
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                        <td>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3"  >
+                            <table  >
+                                <tr>
+                                    <td>
+                                        <asp:Label ID="Label51" runat="server" CssClass="Label" Text="�ϴ���Ŀ"></asp:Label></td>
+                                    <td align="left">
+                                        <asp:FileUpload ID="fileUpload1" runat="server" /></td>
+                                    <td>
+                                        &nbsp;<asp:Button ID="btnFileUpload1" runat="server" CssClass="Button" Text="�ϴ�"
+                                            OnClick="btnFileUpload1_Click" /></td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td align="left">
+                                        <asp:Label ID="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+                                    <td align="left">
+                                    </td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                 
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectMain.aspx.bak.svn-base b/Project/.svn/text-base/ProjectMain.aspx.bak.svn-base
new file mode 100644
index 0000000..d163925
--- /dev/null
+++ b/Project/.svn/text-base/ProjectMain.aspx.bak.svn-base
@@ -0,0 +1,483 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectMain.aspx.cs" Inherits="ProjectMain" EnableEventValidation = "false" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%"   class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td colspan="3" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:GridView ID="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Left"></HeaderStyle>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="left"></RowStyle>
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                <Columns>
+                                    <asp:BoundField DataField="pk_projDetail" HeaderText="pdid" Visible="false"></asp:BoundField>
+                                    <asp:TemplateField>
+                                        <HeaderTemplate>
+                                            <!--input   id="selectAll"   onclick="SelectAll(this)"   type="checkbox"   value="ȫѡ"   /-->
+                                            ѡ��
+                                        </HeaderTemplate>
+                                        <HeaderStyle HorizontalAlign="Left" Wrap="False" />
+                                        <ItemTemplate>
+                                            <input id="checkNews" type="checkbox" runat="server" />
+                                        </ItemTemplate>
+                                        <ItemStyle HorizontalAlign="Left" />
+                                    </asp:TemplateField>
+                                    <asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="dep_name" HeaderText="����" ItemStyle-HorizontalAlign="Left"
+                                        SortExpression="dep_name">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;"
+                                        ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                                        <HeaderStyle HorizontalAlign="Center" />
+                                        <ItemStyle HorizontalAlign="Center" Wrap="False" />
+                                    </asp:CommandField>
+                                </Columns>
+                                <EmptyDataTemplate>
+                                    û������</EmptyDataTemplate>
+                                <PagerStyle HorizontalAlign="Right" />
+                            </asp:GridView>
+                            <asp:Button ID="btn_addNew" runat="server" Text="������Ŀ" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="btnPrjToApprove" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnToApprove_Click" />
+                            <asp:Button ID="btnpdToApprove" runat="server" CssClass="Button" Text="��Ŀ�ύ" OnClick="btnpdToApprove_Click" />
+                            <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" Width="100%">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td    >
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label> 
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="534px" CausesValidation="True"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="��������Ŀ����" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True" CausesValidation="True">0</asp:TextBox>% 
+                                                                    </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True"></asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="true"></asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px" CausesValidation="True">0</asp:TextBox>
+                                                                    %<asp:RangeValidator id="RangeValidator3" runat="server" ControlToValidate="txtProjPercent"
+                                                            ErrorMessage="��ĿȨ��ֻ����0-100�����֡�" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtProjPercent"
+                                                                        ErrorMessage="��������ĿȨ��" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td >
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtProjMem4delete"
+                                                                        ErrorMessage="������ɾ����Ŀ������˵��" SetFocusOnError="True" ValidationGroup="3">*</asp:RequiredFieldValidator>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" ValidationGroup="1" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                            <asp:Button ID="btnpj2approve" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnpj2approve_Click1" ValidationGroup="1" Visible="False" />
+                                                            <asp:Button ID="btnDelete" runat="server" CssClass="Button" Text="ɾ��" OnClick="btnDelete_Click" ValidationGroup="3" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server" CausesValidation="True"></asp:TextBox>
+                                                        %
+                                                        
+                                                        <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�����ٷֱ�ֻ����0-100������1" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                        <asp:RequiredFieldValidator id="RequiredFieldValidator3" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�������¶���ɰٷֱ�" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                       </tr>
+                                                       
+                                                       <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="���� "></asp:Label></td>
+                                                        <td align="left">
+                                                            <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="�ϴ�" OnClick="btnFileUpload_Click" />
+                                                            <asp:Button ID="btnFileUploadReferesh" runat="server" CssClass="Button" Text="ˢ�¸����б�" OnClick="btnFileUploadReferesh_Click1" /></td>
+                                                        <td align="left">
+                                                            &nbsp;</td>
+                                                        <td>
+                                                            &nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                        <td colspan="3" align="left">
+                                                            <asp:GridView ID="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                                runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                                Width="70%" ShowFooter="True" AutoGenerateColumns="False" OnRowDeleting="GVFiles_RowDeleting">
+                                                                <Columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr"
+                                                                        HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </Columns>
+                                                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                                                                <EmptyDataTemplate>
+                                                                    û������</EmptyDataTemplate>
+                                                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                                                <PagerStyle HorizontalAlign="Right" />
+                                                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+                                                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                                            </asp:GridView>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" class="ALine">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" align="center">
+                                                            <div runat="server" id="projMonthDetailEdit">
+                                                                <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                                <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" ValidationGroup="1" /></div>
+                                                        </td>
+                                                    </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <table align="left" >
+                                         <tr>
+                                        <td   >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary><asp:ValidationSummary id="ValidationSummary2" runat="server" ValidationGroup="3" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                   
+                                        </table>
+                                        <br />
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater ID="RepeaterApproveList" runat="server">
+                                                        <ItemTemplate>
+                                                               <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                        </ItemTemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div></asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectMain.aspx.cs.svn-base b/Project/.svn/text-base/ProjectMain.aspx.cs.svn-base
new file mode 100644
index 0000000..d3ed871
--- /dev/null
+++ b/Project/.svn/text-base/ProjectMain.aspx.cs.svn-base
@@ -0,0 +1,1000 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using view.App_Code;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectMain :  PageBase
+    {
+        private LProject _logic;
+
+  
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+
+            Validbtncontrols(rdblstMonth.SelectedValue=="0");
+            CurrentMonthSubmit();
+
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// ֻ�����ύ��ǰ���µ���Ŀ
+    /// </summary>
+    void CurrentMonthSubmit()
+    {
+        this.btnpdToApprove.Visible = Convert.ToInt32(this.btnYear.Text) == DateTime.Today.Year && rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected;
+        btnpd2approve.Visible = btnpdToApprove.Visible;
+    }
+
+    void Validbtncontrols(bool visible)
+    {
+        btn_addNew.Visible = visible;
+        btnPrjToApprove.Visible = visible;
+        btnDelete.Visible = visible;
+
+
+    }
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        { 
+            GridView1.DataSource = _logic.GetAllProjectDetail(lem.GetEmployee.ID,btnYear.Text, rdblstMonth.SelectedValue).DefaultView;  
+            GridView1.DataBind();
+            UpdateSession();
+           
+           // ProjectDataBind();
+         //   ProjectDetailDataBind();
+            //    btnSubmit.Enabled = false;
+           ClearProjDetailData();
+           ClearProjData();
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+         
+        void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+          //  this.TxtBtnYear.Text = btnYear.Text;
+
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "PK_DEPARTMENT";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                //           _logic = (LEmployee)Session[appScope.PagelevelObj];
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+//        Session[appScope.PagelevelObj] = _logic;
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+     //       txtProjMem4delete.Visible = (_logic.GetProject.pj_status == ProjectStatus.����δ�ύ) && rdblstMonth.Items[0].Selected;  //ֻ��ɾ���Լ������ġ�
+            txtProjMem4delete.Visible = rdblstMonth.Items[0].Selected;  // ����ɾ���κ���Ŀ״̬
+            lbprjmem4Delete.Visible = txtProjMem4delete.Visible;
+            btnDelete.Visible = txtProjMem4delete.Visible;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            txtProjMaster.Text = lem.GetEmployee.em_name;
+           txtProjPercent.Text = _logic.GetProject.pj_percent.ToString() ;
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+
+            ApproveListBind(_logic.GetProject.ID);
+
+           // btnDelete.Visible = true;
+        }
+    void ApproveListBind(int id)
+    {
+        RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+        RepeaterApproveList.DataBind();
+        panelApprovelist.Visible = true;
+    }
+        /// <summary>
+        /// ҳ�����Ŀ������Ϣ������Ϣ�ش�����Ŀʵ��
+        ///  
+        /// </summary>
+        void SetProjectDataBack()
+        {
+
+            if (_logic.GetProject.ID > 0)
+            {
+                _logic.GetProject.lastmodified = DateTime.Now.ToString();
+
+            } 
+
+            //    ProjectDetail.Visible = true;
+            _logic.GetProject.pj_name  = txtProjectName.Text;
+            _logic.GetProject.pj_planStartDate =  drpdProjlisFromYear.SelectedValue +"-" + drplstProjFromMonth.SelectedValue +"-01"; 
+            _logic.GetProject.pj_planEndDate = drplstProjectToYear.SelectedValue +"-" + drlstProjToMonth.SelectedValue +"-01";
+            _logic.GetProject.pj_master = lem.GetEmployee.ID;
+            _logic.GetProject.pj_mem =txtPrjDesc.Text;
+            //   _logic.GetProject.pj_progress  =   Convert.ToInt32(txtProjProgress.Text)  ;  //��Ŀ����
+            if (txtProjPercent.Text != string.Empty) _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text) ;               //��ĿȨ��
+            _logic.GetProject.pj_type = drplstProjType.SelectedValue;
+            _logic.GetProject.pj_status = _logic.GetProject.pj_status == String.Empty ? ProjectStatus.����δ�ύ : _logic.GetProject.pj_status;
+            _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+            _logic.GetProject.pj_dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            if (_logic.GetProject.pj_nextDept == 0)
+                _logic.GetProject.pj_nextDept = -1;
+            else
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_nextDept;
+
+            /*  
+             * _logic.GetProject.pj_nextDept = _logic.GetProject.pj_nextDept == 0 ? -1 ; _logic.GetProject.pj_nextDept;
+          
+            * _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment( _logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if(dep.GetDepartment.dep_mastdept==0) //û���ϼ�����
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                }
+            }
+             * */
+            
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+            btnSubmit.Visible = true;
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+           
+            ApproveListBind(_logic.GetProjectDetail.ID);
+             
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+            btnSubmit.Visible = false;
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            panelApprovelist.Visible = false;
+        }
+
+
+        private void SetProjectDetailBack()
+        {
+            if (_logic.GetProjectDetail.ID > 0)
+            {
+                _logic.GetProjectDetail.lastmodified = DateTime.Now.ToString();
+
+            } 
+ 
+            _logic.GetProject.pj_progress = Convert.ToInt32(txtPrjProgress.Text) ;
+            _logic.GetProject.pj_finishDate =txtPdActualEndDate.Text  ;
+            _logic.GetProjectDetail.pd_planTarget =txtPdPlanTarget.Text  ;
+            _logic.GetProjectDetail.pd_finishedTarget = txtPdFinishTarget.Text  ;
+            _logic.GetProjectDetail.pd_percent =Convert.ToInt32(txtPdPercent.Text)  ;
+            _logic.GetProjectDetail.pd_mem =txtPdMem.Text ;
+            //����ʱstatusĬ��Ϊ��δ�ύ��
+
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            ClearProjData();
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            validProjControles();
+            ProjectMonthDetail.Visible = false;
+
+            
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+        /// <summary>
+        /// ������Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnProjSubmit_Click(object sender, EventArgs e)
+        {
+
+            if(_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+
+            //�����Ŀ״̬��û�б仯���仯���������档
+           if(_logic.GetProject.pj_status.Equals(ProjectStatus.�������ύ)||_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ύ))
+           {
+                LProject lp = new LProject();
+                lp.GetProject.ID =_logic.GetProject.ID;
+                lp.GetProject.getModel();
+                if(!lp.GetProject.pj_status.Equals(_logic.GetProject.pj_status))
+                {
+                 //   Response.Write("<script>alert('��Ŀ  " +_logic.GetProject.pj_name +   "�Ѿ�������������ʧ�ܡ�')</script>");
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "�Ѿ�������������ʧ�ܡ�');", true);
+                    ProjectDataBind();
+                    return;
+                }
+            }
+            SetProjectDataBack();
+            if (_logic.GetProject.pj_name == string.Empty || _logic.GetProject.pj_name.Trim().Length == 0) return;
+            if (_logic.GetProject.pj_percent==0) return;
+            if (_logic.GetProject.ID > 0) _logic.UpdateProject(); else _logic.AddProject();
+            ClearProjData();
+            Databound();
+        
+        }
+
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+        {
+            /*
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.ID = e.Row.Cells[0].Text.Trim();
+                string pdstatus = e.Row.Cells[13].Text.Trim();
+                chk.Enabled = (pdstatus == ProjectDetailStatus.�¶�δ�ύ || pdstatus == ProjectDetailStatus.����δͨ�� ||
+                               pdstatus == ProjectDetailStatus.���δͨ�� || pdstatus == ProjectDetailStatus.Ԥ��δͨ��);
+                e.Row.Cells[1].Controls.Add(chk);
+            }
+            */
+        }
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnReset_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+
+        /// <summary>
+        /// delete the project and details
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if(txtProjMem4delete.Text ==null ) return;
+            
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) || _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���))
+            {
+                 
+                 ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + " ��Ŀ�Ѿ���ɣ�������ɾ����');", true);
+                return;
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if ( (dep.GetDepartment.dep_manager != lem.GetEmployee.ID) &&(dep.GetDepartment.dep_mastdept != 0))
+                    {  
+                        return;
+                    }
+                }
+
+
+                if (!_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) ) 
+                {
+                    _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+                    _logic.GetProject.pj_status = Tracen.Utils.ProjectStatus.ɾ��δ�ύ;
+
+                    _logic.GetProject.Update();
+                }
+                else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+                {
+
+                    _logic.Delete();
+
+                } 
+           
+ 
+
+            ClearProjData();
+            Databound();
+        }
+
+        /***************************************** internal methods ********************************************/
+ 
+
+        private void chgOperTxt(bool addNew)
+        {
+         
+          
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+            btnSaveNewProj.Enabled = false;
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+            panelApprovelist.Visible = false;
+            
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+           // btnSaveNewProj.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+           // btnDelete.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+            validProjControles();
+            btnSubmit.Visible = false;
+      
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            validPdControles();
+        }
+    void validProjControles()
+    {
+        bool canEditSubmit;
+        canEditSubmit = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || !_logic.GetProject.pj_status.EndsWith("�ѷ���") && !_logic.GetProject.pj_status.EndsWith("��ͨ��") && !_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)
+                                  &&!_logic.GetProject.pj_status.EndsWith("��ͨ��")||
+                                 _logic.GetProject.pj_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.Equals(string.Empty);
+        txtProjectName.ReadOnly = !canEditSubmit;
+       // drpdProjlisFromYear.Enabled = divEditProject.Visible;
+       //drplstProjFromMonth.Enabled = divEditProject.Visible;
+       // drplstProjectToYear.Enabled = divEditProject.Visible;
+       // drlstProjToMonth.Enabled = divEditProject.Visible;
+        drplstProjType.Enabled = canEditSubmit;
+        txtPrjDesc.ReadOnly = !canEditSubmit;
+      //  txtProjProgress.ReadOnly = !divEditProject.Visible; //��Ŀ����
+        txtProjPercent.ReadOnly = !canEditSubmit; //��ĿȨ��
+        SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+       // txtProjMem4delete.ReadOnly = !canEditSubmit; //����δ�ύ;
+        //  lbprjmem4Delete.Visible = divEditProject.Visible;
+        drplstProjDept.Enabled = canEditSubmit;
+
+        bool canNotDel = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) ||
+                         _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                         _logic.GetProject.pj_status == String.Empty || 
+                         _logic.GetProject.pj_status.StartsWith("ɾ��") ||
+                         _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��);
+
+        bool canDel = !canNotDel;
+        canDel = canDel && this.rdblstMonth.Items[0].Selected;
+         txtProjMem4delete.Visible = canDel;
+         lbprjmem4Delete.Visible = canDel;
+       //  if (btnDelete.Visible)
+         btnDelete.Visible = canDel;
+
+       
+    }
+    void validPdControles()
+    {
+        //--monthly detail.
+        projMonthDetailEdit.Visible = _logic.GetProjectDetail.pd_status.Equals(ProjectDetailStatus.�¶�δ�ύ) ||
+                                      !_logic.GetProjectDetail.pd_status.EndsWith("��ͨ��") &&
+                                      !_logic.GetProjectDetail.pd_status.EndsWith("��ͨ��") ||
+                                      _logic.GetProjectDetail.pd_status.Equals(string.Empty);
+ 
+
+
+        projMonthDetailEdit.Visible = projMonthDetailEdit.Visible &&
+                                      !(_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                        _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) &&
+                                         !_logic.GetProject.pj_status.EndsWith("δͨ��")) ||
+                                        _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") ||
+                                        _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��"));
+
+        projMonthDetailEdit.Visible = projMonthDetailEdit.Visible ||
+                                      _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ�ѷ���);
+        txtPdName.ReadOnly = !projMonthDetailEdit.Visible;
+     //   txtPdStartDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPdEndDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPrjProgress.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPdActualEndDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdPlanTarget.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdFinishTarget.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdPercent.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdMem.ReadOnly = !  projMonthDetailEdit.Visible ;
+
+        //--��˰�ť
+      
+
+    }
+
+
+        /// <summary>
+        /// project detail 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+            
+            SetProjectDetailBack();
+          
+            _logic.GetProjectDetail.Update();
+            ClearProjDetailData();
+            Databound();
+        }
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnToApprove_Click(object sender, EventArgs e)
+        {
+       //       _logic.GetProject.ID = Convert.ToInt32(GridView1.Rows[1].Cells[0].Text.Trim());
+
+
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if(  _logic.GetProject.pj_status.EndsWith("δ�ύ")||  _logic.GetProject.pj_status.EndsWith("δͨ��") )
+                {
+                    _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                    //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                    {
+                        _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                        if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                            _logic.GetProject.Update();
+                            continue; //�����쵼��������
+                        }
+                    }
+                    //����������ύ�������쵼��׼
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                    _logic.GetProject.Update();
+                }
+            }
+             
+            Databound();
+
+
+        }
+
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>";
+    }
+
+   /// <summary>
+   /// �¶��ύ
+   /// </summary>
+   /// <param name="sender"></param>
+   /// <param name="e"></param>
+    protected void btnpdToApprove_Click(object sender, EventArgs e)
+    {
+
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) continue; //�������Ŀ�������ύ��
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) continue;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.����Ԥ��ͨ��)) continue;
+            if (_logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) continue;
+            if (_logic.GetProject.pj_status.StartsWith("����") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) continue;
+
+            if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.StartsWith("ɾ��"))
+            {
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                {
+                    _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                    if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+                    {
+                        if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+                        }
+
+                        if (_logic.GetProject.pj_status.StartsWith("����"))
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                        }
+                        _logic.GetProject.Update();
+                         
+                    }
+
+                    else
+                    {
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+
+                        _logic.GetProjectDetail.Update();
+                        
+                        _logic.GetProject.Update();
+                    }
+
+                    if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            if (_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ))
+                                _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��; 
+                            else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ))
+                                _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                            else
+                            _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��; 
+                            _logic.GetProject.Update();
+                            _logic.GetProjectDetail.Update();
+                            continue;  //�����쵼��������
+                        }
+                    continue;
+                }
+                //����������ύ�������쵼��׼
+
+                  if (_logic.GetProject.pj_status.EndsWith("δ�ύ")||_logic.GetProject.pj_status.EndsWith("δͨ��"))
+                  {
+                      if(_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                      {
+                          _logic.GetProject.pj_status = ProjectStatus.ɾ�����ύ;
+                      }
+
+                      if (_logic.GetProject.pj_status.StartsWith("����"))
+                      {
+                          _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                      }
+                  } 
+                else
+                {
+                  _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                  _logic.GetProjectDetail.Update();
+                }
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+
+    }
+    protected void btnpd2approve_Click(object sender, EventArgs e)
+    {
+        btnSubmit_Click( sender, e);
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return; 
+        if (_logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) return;
+        if (_logic.GetProject.pj_status.StartsWith("����") && ( !_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))) return;
+
+
+        if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.StartsWith("ɾ��"))
+        {
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    {
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+                    }
+
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                    {
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                    }
+                    _logic.GetProject.Update();
+                }
+
+                else
+                {
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                    _logic.GetProjectDetail.Update();
+                    _logic.GetProject.Update();
+                }
+
+                if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                {
+                    if (_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+                    else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ))
+                        _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                    else
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+                    _logic.GetProject.Update();
+                    _logic.GetProjectDetail.Update();
+                    //�����쵼��������
+                }
+                Databound();
+                return;
+            }
+            //����������ύ�������쵼��׼
+
+            if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+            {
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ�����ύ;
+                }
+
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                }
+            } 
+            else
+            {
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                _logic.GetProjectDetail.Update();
+            }
+            _logic.GetProject.Update();
+        }
+        Databound();
+    }
+    protected void btnpj2approve_Click(object sender, EventArgs e)
+    {
+
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return; //�������Ŀ�������ύ��
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+        if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��"))
+        {
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                {
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+                    _logic.GetProject.Update();
+                    _logic.GetProjectDetail.Update();
+                    //�����쵼��������
+                }
+            }
+            //����������ύ�������쵼��׼
+            _logic.GetProject.Update();
+            _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+            _logic.GetProjectDetail.Update();
+        }
+        Databound();
+    }
+    protected void btnFileUpload_Click(object sender, EventArgs e)
+    {
+       ��
+        
+        Session["uploadCode"] =   new Random().Next();
+        string fileCode = Session["uploadCode"].ToString();
+        string fileType =  ((int)FileType.ProjectDetail).ToString();
+        string fileInfo = _logic.GetProjectDetail.ID.ToString();
+        string fileUPload = " window.showModalDialog('../upload/fileUpload.aspx?'+Math.random() +'=" + fileCode + "&fileType=" + fileType + "&fileInfo=" + fileInfo + "&id=" + lem.GetEmployee.ID + "'  )";
+        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", fileUPload, true);
+      �� ��
+      ��
+    ��
+    }
+   
+    protected void btnFileUploadReferesh_Click1(object sender, EventArgs e)
+    {
+
+        GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+        GVFiles.DataBind();
+
+    }
+    protected void GVFiles_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    { 
+        LFile fileObj = new LFile();
+        if (GVFiles != null)
+        {
+            if (GVFiles.DataKeys != null)
+            {
+                string id = GVFiles.DataKeys[e.RowIndex].Value.ToString();
+             
+                fileObj.Initialize(int.Parse(id));
+                fileObj.GetFilesmgrExt.Delete();
+                GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+                GVFiles.DataBind();
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        
+       
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName =  "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest ;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+   
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+      //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    protected void btnpj2approve_Click1(object sender, EventArgs e)
+    {
+
+    }
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+   
+    protected void Excel_Click(object sender, EventArgs e)
+    { 
+        Master.ScriptMgr.RegisterPostBackControl( Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[1].Visible = false;
+        GridView1.Columns[GridView1.Columns.Count -1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = true;
+        GridView1.Columns[1].Visible = true;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+
+ ��
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectMain.aspx.svn-base b/Project/.svn/text-base/ProjectMain.aspx.svn-base
new file mode 100644
index 0000000..6c6db5f
--- /dev/null
+++ b/Project/.svn/text-base/ProjectMain.aspx.svn-base
@@ -0,0 +1,484 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectMain.aspx.cs" Inherits="ProjectMain" EnableEventValidation = "false" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%"   class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td colspan="3" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:GridView ID="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Left"></HeaderStyle>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="left"></RowStyle>
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                <Columns>
+                                    <asp:BoundField DataField="pk_projDetail" HeaderText="pdid" Visible="false"></asp:BoundField>
+                                    <asp:TemplateField>
+                                        <HeaderTemplate>
+                                            <!--input   id="selectAll"   onclick="SelectAll(this)"   type="checkbox"   value="ȫѡ"   /-->
+                                            ѡ��
+                                        </HeaderTemplate>
+                                        <HeaderStyle HorizontalAlign="Left" Wrap="False" />
+                                        <ItemTemplate>
+                                            <input id="checkNews" type="checkbox" runat="server" />
+                                        </ItemTemplate>
+                                        <ItemStyle HorizontalAlign="Left" />
+                                    </asp:TemplateField>
+                                    <asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="dep_name" HeaderText="����" ItemStyle-HorizontalAlign="Left"
+                                        SortExpression="dep_name">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"
+                                    	 >
+                                        <ItemStyle Wrap="False" />
+                                        <HeaderStyle Wrap="False" />
+                                    </asp:BoundField>
+                                    <asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;"
+                                        ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                                        <HeaderStyle HorizontalAlign="Center" />
+                                        <ItemStyle HorizontalAlign="Center" Wrap="False" />
+                                    </asp:CommandField>
+                                </Columns>
+                                <EmptyDataTemplate>
+                                    û������</EmptyDataTemplate>
+                                <PagerStyle HorizontalAlign="Right" />
+                            </asp:GridView>
+                            <asp:Button ID="btn_addNew" runat="server" Text="������Ŀ" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="btnPrjToApprove" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnToApprove_Click" />
+                            <asp:Button ID="btnpdToApprove" runat="server" CssClass="Button" Text="��Ŀ�ύ" OnClick="btnpdToApprove_Click" />
+                            <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" Width="100%">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td    >
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label> 
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="534px" CausesValidation="True"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="��������Ŀ����" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True" CausesValidation="True">0</asp:TextBox>% 
+                                                                    </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True"></asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="true"></asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px" CausesValidation="True">0</asp:TextBox>
+                                                                    %<asp:RangeValidator id="RangeValidator3" runat="server" ControlToValidate="txtProjPercent"
+                                                            ErrorMessage="��ĿȨ��ֻ����0-100�����֡�" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtProjPercent"
+                                                                        ErrorMessage="��������ĿȨ��" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td >
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtProjMem4delete"
+                                                                        ErrorMessage="������ɾ����Ŀ������˵��" SetFocusOnError="True" ValidationGroup="3">*</asp:RequiredFieldValidator>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" ValidationGroup="1" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                            <asp:Button ID="btnpj2approve" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnpj2approve_Click1" ValidationGroup="1" Visible="False" />
+                                                            <asp:Button ID="btnDelete" runat="server" CssClass="Button" Text="ɾ��" OnClick="btnDelete_Click" ValidationGroup="3" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server" CausesValidation="True"></asp:TextBox>
+                                                        %
+                                                        
+                                                        <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�����ٷֱ�ֻ����0-100������1" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                        <asp:RequiredFieldValidator id="RequiredFieldValidator3" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�������¶���ɰٷֱ�" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                       </tr>
+                                                       
+                                                       <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="���� "></asp:Label></td>
+                                                        <td align="left">
+                                                            <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="�ϴ�" OnClick="btnFileUpload_Click" />
+                                                            <asp:Button ID="btnFileUploadReferesh" runat="server" CssClass="Button" Text="ˢ�¸����б�" OnClick="btnFileUploadReferesh_Click1" /></td>
+                                                        <td align="left">
+                                                            &nbsp;</td>
+                                                        <td>
+                                                            &nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                        <td colspan="3" align="left">
+                                                            <asp:GridView ID="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                                runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                                Width="70%" ShowFooter="True" AutoGenerateColumns="False" OnRowDeleting="GVFiles_RowDeleting">
+                                                                <Columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr"
+                                                                        HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </Columns>
+                                                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                                                                <EmptyDataTemplate>
+                                                                    û������</EmptyDataTemplate>
+                                                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                                                <PagerStyle HorizontalAlign="Right" />
+                                                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+                                                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                                            </asp:GridView>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" class="ALine">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" align="center">
+                                                            <div runat="server" id="projMonthDetailEdit">
+                                                                <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                                <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" ValidationGroup="1" /></div>
+                                                        </td>
+                                                    </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <table align="left" >
+                                         <tr>
+                                        <td   >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary><asp:ValidationSummary id="ValidationSummary2" runat="server" ValidationGroup="3" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                   
+                                        </table>
+                                        <br />
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater ID="RepeaterApproveList" runat="server">
+                                                        <ItemTemplate>
+                                                               <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                        </ItemTemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div></asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/.svn/text-base/ProjectsQuery.aspx.bak.svn-base b/Project/.svn/text-base/ProjectsQuery.aspx.bak.svn-base
new file mode 100644
index 0000000..d66588c
--- /dev/null
+++ b/Project/.svn/text-base/ProjectsQuery.aspx.bak.svn-base
@@ -0,0 +1,222 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="ProjectsQuery.aspx.cs" Inherits="ProjectsQuery"   EnableEventValidation = "false"%>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%"  class="Table_Border" border=0>
+     <tr>
+            <td colspan="3">
+             <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+                 </td>
+        </tr>
+        <tr>
+        <td colspan="3" class ="ALine"></td>
+        </tr>
+        
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDeptEmp" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="������ȫ������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td class="VLine"  ></td>
+    <td    align="left" valign="top" width="800"> <!------ THE DATA GRID AREA ------>
+       
+       <table width="100%">
+        <tr>
+                        <td > ��Ŀ���� </td>  
+           </tr>
+       <tr>
+       <td>
+       <asp:GridView id="GridView1" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid"  EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView1_PageIndexChanging"
+         �� OnSorting="GridView1_Sorting"
+         �� OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+         �� DataKeyNames="pk_employee" 
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_employee" HeaderText="empid" Visible="false" >  </asp:BoundField>
+		                                                       ��
+				
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                
+                
+                 <asp:BoundField DataField="de_title" HeaderText="ְ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="de_title"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                
+				<asp:BoundField DataField="pd_period" HeaderText="ʱ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="pd_period"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				   
+				 
+              
+			 	 <asp:BoundField DataField="total_score" HeaderText="�ܵ÷�" SortExpression="total_score"    > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="��ϸ" ShowDeleteButton="FALSE"  ��
+				ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴��Ŀ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />
+                </asp:CommandField>
+			</columns>
+            <pagerstyle horizontalalign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+             </asp:GridView><asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"
+            Text="����Excel" />
+            
+       </td>
+       </tr>
+       
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+        <tr>
+                        <td > ��Ŀ��ϸ </td>  
+           </tr>
+        <tr>
+       <td>
+       
+            <div runat="Server" id="projectDetail" >
+         <asp:GridView id="GridView2" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid" DataKeyNames="pk_projDetail" EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView2_PageIndexChanging"
+             
+            
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                         
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				
+			</columns>
+            <emptydatatemplate> û������</emptydatatemplate>
+            <pagerstyle horizontalalign="Right" />
+        </asp:GridView>
+        <asp:Button id="Button2" runat="server" CssClass="Button" onclick="Excel_Click2"
+            Text="����Excel" />
+         </div>
+       
+       </td>
+       </tr>
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+       </table>
+         
+            </td>
+             </tr>
+          <tr>
+                        <td colspan="3" class="ALine" />    
+           </tr>
+            
+            <tr>
+                        <td colspan="3" align="left" valign="top">
+                              
+             
+      
+       </td></tr>
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Project/.svn/text-base/ProjectsQuery.aspx.cs.svn-base b/Project/.svn/text-base/ProjectsQuery.aspx.cs.svn-base
new file mode 100644
index 0000000..ea86289
--- /dev/null
+++ b/Project/.svn/text-base/ProjectsQuery.aspx.cs.svn-base
@@ -0,0 +1,298 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class ProjectsQuery : PageBase
+{
+    private LProject _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            _logic = new LProject();
+            bindDeptEmp();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        DataView dv2 = _logic.GetSumProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        if ( TreeDeptEmp.SelectedNode !=null && TreeDeptEmp.SelectedNode.Value!="0")
+        {
+          string  selectedValue = TreeDeptEmp.SelectedValue;
+            string wherecls = "pk_department= '" + selectedValue + "'";
+          if (TreeDeptEmp.SelectedNode.Text.StartsWith("."))
+          {
+              wherecls = "pk_employee= '" + selectedValue + "'";
+          }
+          dv2.RowFilter = wherecls;
+       } 
+
+ 
+
+        GridView1.DataSource = dv2 ;
+        GridView1.DataBind();
+        if (GridView1.DataKeys != null && GridView1.DataKeys.Count>0 && GridView1.SelectedIndex!=-1)
+        { 
+            Databound( GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString());
+        }else
+
+        {
+            GridView2.DataSource = null;
+            GridView2.DataBind();
+        }
+            
+     
+       
+        UpdateSession();
+    // btnSubmit.Enabled = false;
+      //  ClearDetail();
+    }
+
+    private void Databound(string empId)
+    {
+       // if (empId == null) throw new ArgumentNullException("empId");
+        if (empId == null) return;
+
+        DataView dv = _logic.GetAllProjectDetail(Convert.ToInt32(empId),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        GridView2.DataSource = dv;
+        GridView2.DataBind();
+        
+    }
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+       // TreeDeptEmp.Nodes.Clear();
+        BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode,lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+
+
+
+    }
+
+
+
+    public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv, DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<Strong>" + row["dep_name"] + "</Strong>";
+            node.Value = row["pk_department"].ToString(); 
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+            empdv.RowFilter = "de_dept=" + node.Value;
+            foreach (DataRowView emrow in empdv)
+            {
+                TreeNode tnEmp = new TreeNode(    "."+emrow["em_name"]   , emrow["pk_employee"].ToString());
+                node.ChildNodes.Add(tnEmp);
+            }
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                tree.Nodes.Add(node);
+
+
+            }
+            else
+            {
+
+                pNode.ChildNodes.Add(node);
+
+            }
+            BindEmpTree(tree, node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+    void setTreeDeptEmpSelected(string toFind,TreeNode nd)
+    {
+        foreach (TreeNode cnd in nd.ChildNodes)
+        {
+            if (cnd.Value == toFind) 
+            {
+                cnd.Selected = true;
+                break;
+            }
+            else
+            {
+                setTreeDeptEmpSelected(toFind,cnd);
+            }
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LProject)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+ ��
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+  ��
+
+  ��
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView2_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView2.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+  ��
+  ��
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+     {
+        Databound();
+      ��
+    }
+
+
+ 
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+
+        Databound();
+       
+    }
+    protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        Databound();
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+        //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        trigger = new PostBackTrigger();
+        trigger.ControlID = Button2.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export1("application/ms-excel", "��Ŀ�����б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    protected void Excel_Click2(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView2.AllowPaging = false;
+        
+        Databound();
+        Export2("application/ms-excel", "��Ŀ��ϸ�б�.xls");
+        GridView2.AllowPaging = false;
+        
+        Databound();
+
+    }
+
+
+    private void Export1(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+    private void Export2(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView2.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
\ No newline at end of file
diff --git a/Project/.svn/text-base/ProjectsQuery.aspx.svn-base b/Project/.svn/text-base/ProjectsQuery.aspx.svn-base
new file mode 100644
index 0000000..a7c2f6b
--- /dev/null
+++ b/Project/.svn/text-base/ProjectsQuery.aspx.svn-base
@@ -0,0 +1,224 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="ProjectsQuery.aspx.cs" Inherits="ProjectsQuery"   EnableEventValidation = "false"%>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%"  class="Table_Border" border=0>
+     <tr>
+            <td colspan="3">
+             <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+                 </td>
+        </tr>
+        <tr>
+        <td colspan="3" class ="ALine"></td>
+        </tr>
+        
+    <tr><td width="50" height="200" align="left"  valign="top">
+       <!--div   style= "width:200px;height:600px;overflow:scroll "--> 
+        <asp:TreeView ID="TreeDeptEmp" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="������ȫ������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+      <!--/div-->
+    </td>
+    <td class="VLine"  ></td>
+    <td    align="left" valign="top" width="800"> <!------ THE DATA GRID AREA ------>
+       
+       <table width="100%">
+        <tr>
+                        <td > ��Ŀ���� </td>  
+           </tr>
+       <tr>
+       <td>
+       <asp:GridView id="GridView1" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid"  EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView1_PageIndexChanging"
+         �� OnSorting="GridView1_Sorting"
+         �� OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+         �� DataKeyNames="pk_employee" 
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_employee" HeaderText="empid" Visible="false" >  </asp:BoundField>
+		                                                       ��
+				
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                
+                
+                 <asp:BoundField DataField="de_title" HeaderText="ְ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="de_title"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                
+				<asp:BoundField DataField="pd_period" HeaderText="ʱ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="pd_period"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				   
+				 
+              
+			 	 <asp:BoundField DataField="total_score" HeaderText="�ܵ÷�" SortExpression="total_score"    > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="��ϸ" ShowDeleteButton="FALSE"  ��
+				ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴��Ŀ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />
+                </asp:CommandField>
+			</columns>
+            <pagerstyle horizontalalign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+             </asp:GridView><asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"
+            Text="����Excel" />
+            
+       </td>
+       </tr>
+       
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+        <tr>
+                        <td > ��Ŀ��ϸ </td>  
+           </tr>
+        <tr>
+       <td>
+       
+            <div runat="Server" id="projectDetail" >
+         <asp:GridView id="GridView2" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid" DataKeyNames="pk_projDetail" EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView2_PageIndexChanging"
+             
+            
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                         
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"    > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				
+			</columns>
+            <emptydatatemplate> û������</emptydatatemplate>
+            <pagerstyle horizontalalign="Right" />
+        </asp:GridView>
+        <asp:Button id="Button2" runat="server" CssClass="Button" onclick="Excel_Click2"
+            Text="����Excel" />
+         </div>
+       
+       </td>
+       </tr>
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+       </table>
+         
+            </td>
+             </tr>
+          <tr>
+                        <td colspan="3" class="ALine" />    
+           </tr>
+            
+            <tr>
+                        <td colspan="3" align="left" valign="top">
+                              
+             
+      
+       </td></tr>
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Project/.svn/text-base/WorkPlanMain.aspx.cs.svn-base b/Project/.svn/text-base/WorkPlanMain.aspx.cs.svn-base
new file mode 100644
index 0000000..a1b1182
--- /dev/null
+++ b/Project/.svn/text-base/WorkPlanMain.aspx.cs.svn-base
@@ -0,0 +1,232 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class WorkPlanMain : PageBase
+{
+    private LWorkPlan _logic;
+   
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        lem = (LEmployee)Session["CurrentUser"]; 
+        if (!IsPostBack)
+        {
+            _logic = new LWorkPlan();
+            Calendar1.SelectedDate = DateTime.Today ;
+             Databound();
+            
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+        _logic.CheckWorkPlan(lem.GetEmployee.ID, Calendar1.SelectedDate.ToString(),true);  
+        GridView1.DataSource = _logic.GetLWorkPlan.getWorkplanDetails(lem.GetEmployee.ID,Calendar1.SelectedDate.ToString());
+        GridView1.DataBind();
+        UpdateSession();
+     //   btnSubmit.Enabled = false;
+    //    ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LWorkPlan)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtPlanContent.Text = _logic.GetLWorkPlanDetail.wpd_content;
+        txtPlanMem.Text = _logic.GetLWorkPlanDetail.wpd_mem;
+       
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        // _logic.Initialize();   _logic.CheckWorkPlan ����ʼ�������ƻ�������
+        _logic.InitializeDetail();
+        UpdateSession();
+        DetailDataBind();
+        txtPlanContent.Focus();
+        GridView1.SelectedIndex = -1;
+       ��
+        Databound();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind(); 
+        txtPlanContent.Focus();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLWorkPlanDetail.ID > 0 ? _logic.GetLWorkPlanDetail.Update() : _logic.GetLWorkPlanDetail.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetLWorkPlanDetail.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+      
+        string sortExpression = e.SortExpression;
+        if (GridView1.SortDirection == SortDirection.Ascending)                      //����������
+        {
+             
+            SortGridView(sortExpression, " DESC");
+        }
+        else
+         {
+             
+            SortGridView(sortExpression, " ASC");
+        }
+    }
+ private void SortGridView(string sortExpression, string direction)
+   {
+       DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+       dv.Sort = sortExpression + direction;
+       GridView1.DataSource = dv;                       //��DataView�󶨵�GridView��
+       GridView1.DataBind();
+
+    } 
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+        if (_logic.GetLWorkPlanDetail.ID > 0)
+            _logic.GetLWorkPlanDetail.lastmodified = DateTime.Now.ToString();
+
+        _logic.GetLWorkPlanDetail.wpd_content = txtPlanContent.Text;
+        _logic.GetLWorkPlanDetail.wpd_mem = txtPlanMem.Text;
+        _logic.GetLWorkPlanDetail.wpd_workplan = _logic.GetLWorkPlan.ID;
+        _logic.GetLWorkPlanDetail.wpd_number = _logic.getNexNumber(_logic.GetLWorkPlan.ID);
+    }
+
+    private void chgOperTxt(bool addNew)
+    { 
+        btnSubmit.Enabled = true;
+         DataDetail.Visible = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtPlanMem.Text = "";
+        txtPlanContent.Text = "";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+    protected void Calendar1_SelectionChanged(object sender, EventArgs e)
+    {
+        Databound();
+    }
+    protected void Calendar1_DayRender(object sender, DayRenderEventArgs e)
+    {
+      //  e.Cell.Controls.Add(new LiteralControl(" ������ "));
+     //   e.Cell.Font.Size = FontUnit.XXLarge;
+    }
+}
diff --git a/Project/.svn/text-base/WorkPlanMain.aspx.svn-base b/Project/.svn/text-base/WorkPlanMain.aspx.svn-base
new file mode 100644
index 0000000..5dc5725
--- /dev/null
+++ b/Project/.svn/text-base/WorkPlanMain.aspx.svn-base
@@ -0,0 +1,116 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="WorkPlanMain.aspx.cs" Inherits="WorkPlanMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="40%" class="Table_NoBorder">
+<tr>
+
+<td align="center"   >
+ 
+
+    <asp:Calendar ID="Calendar1" runat="server" BackColor="White" BorderColor="White" BorderWidth="1px" FirstDayOfWeek="Monday" Font-Names="Verdana" Font-Size="19pt" 
+    ForeColor="#265AA3" Height="256px" NextPrevFormat="ShortMonth" OnSelectionChanged="Calendar1_SelectionChanged" ShowGridLines="True" Width="800px" Font-Bold="True" OnDayRender="Calendar1_DayRender">
+        <SelectedDayStyle BackColor="LightSteelBlue" ForeColor="Red" Font-Bold="True" Font-Names="����" Font-Size="XX-Large" />
+        <TodayDayStyle BackColor="#265AA3" ForeColor="White" />
+        <daystyle font-size="XX-Large" />
+        <OtherMonthDayStyle ForeColor="#999999" />
+        <NextPrevStyle Font-Bold="True" Font-Size="19pt" ForeColor="#333333" VerticalAlign="Bottom" />
+        <DayHeaderStyle Font-Bold="True" Font-Size="20pt" />
+        <TitleStyle BackColor="White" BorderColor="#265AA3" BorderWidth="4px" Font-Bold="True"
+            Font-Size="30pt" ForeColor="#265AA3" />
+    </asp:Calendar>
+ 
+    <br />
+
+</td>
+</tr>
+    
+    <tr><td style="width: 800px">
+    
+        <!------ THE DATA GRID AREA ------>
+     
+        <asp:gridview   id="GridView1"  CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        emptydatatext="û�����ݡ�" 
+
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="pk_workplanDetail"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" AutoGenerateColumns="False">
+						 
+            <Columns>
+<asp:BoundField visible="false" DataField="pk_workplanDetail" SortExpression="pk_workplanDetail" HeaderText="workplanid"></asp:BoundField>
+<asp:BoundField visible="false" DataField="wpd_workplan" SortExpression="wpd_workplan" HeaderText="wpd_workplanid"></asp:BoundField>
+<asp:BoundField DataField="wpd_number" SortExpression="wpd_number" HeaderText="���"></asp:BoundField>
+<asp:BoundField DataField="wpd_content"   SortExpression="wpd_content" HeaderText="�ƻ�����"></asp:BoundField>
+<asp:BoundField DataField="wpd_mem"   SortExpression="wpd_mem" HeaderText="�ƻ�˵��"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<emptydatatemplate> û������</emptydatatemplate>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            
+        </asp:gridview>
+        
+        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       </td></tr>
+    <tr><td class="ALine" style="width: 667px"  >
+        </td></tr> 
+    <tr><td style="width: 667px">
+    
+    
+        <!------ THE ADD /DELETE AREA ------>
+      
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+          <table class="Table_NoBorder" border="0" style="width: 755px; height: 122px">
+			<tr>
+			<td align="right" nowrap>
+               <asp:Label ID="Label2" runat="server" CssClass="Label"  Text="�ƻ�����"></asp:Label></td>
+               <td  >
+              
+					<asp:TextBox ID="txtPlanContent" runat="server"  CssClass="TextBox" MaxLength="100" Width="415px"  ></asp:TextBox>
+					</td>
+					  <td></td>
+			 </tr>
+			 <tr>
+			 <td  align="right" nowrap style="height: 44px">
+                <asp:Label ID="Label3" runat="server" CssClass="Label"  Text="�ƻ�˵��"></asp:Label></td><td style="height: 44px"  >
+                   <asp:TextBox ID="txtPlanMem" runat="server" CssClass="TextBox_Long" MaxLength="100" Width="710px" Height="119px" TextMode="MultiLine"  ></asp:TextBox>
+              </td>
+              <td></td>
+              </tr> 
+              <!------ BUTTONS ------>
+			    <tr>
+            <td   align="center" colspan="2">   <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                
+                </td>
+            </tr>
+            
+            </table>
+            </asp:Panel>
+              
+         
+      
+      
+       
+      
+        </td></tr>
+        <tr><td style="width: 667px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Project/.svn/text-base/WorkReport.aspx.cs.svn-base b/Project/.svn/text-base/WorkReport.aspx.cs.svn-base
new file mode 100644
index 0000000..ab303db
--- /dev/null
+++ b/Project/.svn/text-base/WorkReport.aspx.cs.svn-base
@@ -0,0 +1,164 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using Tracen.Utils;
+using ZhangPu.Gov.Logical;
+
+public partial class Project_WorkReport :  PageBase
+{
+    private LFile _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        if(! IsPostBack)
+        {
+            InitializeControles();
+            _logic =new LFile();
+            Databound();
+        }
+
+        SessionSeting();
+       
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LFile)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    void Databound()
+    {
+        GVFiles.DataSource = _logic.GetFilesmgrExt.GetFilesByEmpFileType(lem.GetEmployee.ID,Convert.ToInt32(drplstFileType.SelectedValue));
+        GVFiles.DataBind();
+        UpdateSession();
+
+    }
+    void InitializeControles()
+    {
+        drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+        drplstProjDept.DataTextField = "DEP_NAME";
+        drplstProjDept.DataValueField = "PK_DEPARTMENT";
+        drplstProjDept.DataBind();
+
+        ListItem li = new ListItem("半年度计划",((int)FileType.半年度计划).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("半年度总结", ((int)FileType.半年度总结).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("年度计划", ((int)FileType.年度计划).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("年度总结", ((int)FileType.年度总结).ToString());
+        drplstFileType.Items.Add(li);
+    }
+
+    protected void btnFileUpload_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (drplstProjDept.Items.Count==0) return;
+            if (fileUpload.FileName.Length == 0) return;
+            lbuploadmessage.Text = "";
+            string fileName = fileUpload.FileName;
+
+            System.Random rand = new Random();
+            int len = rand.Next();
+            fileName = lem.GetEmployee.ID + "T" + drplstFileType.SelectedValue + len +
+                       fileName.Substring(fileName.LastIndexOf("."));
+            DirectoryInfo dir = new DirectoryInfo(Server.MapPath("~/upload/" + drplstFileType.SelectedValue));
+            if (!dir.Exists)
+                dir.Create();
+            string fileSavePath = Server.MapPath("~/upload/" + drplstFileType.SelectedValue + "/" + fileName);
+            fileUpload.SaveAs(fileSavePath);
+            lbuploadmessage.Text = "上传成功！";
+
+            LFile _logic = new LFile();
+            _logic.Initialize();
+            _logic.GetFilesmgrExt.File_type = Convert.ToInt32(drplstFileType.SelectedValue);
+            _logic.GetFilesmgrExt.file_dest = fileName;
+            _logic.GetFilesmgrExt.File_Desc = txtFileDesc.Text;
+            _logic.GetFilesmgrExt.File_Emp = Convert.ToInt32(lem.GetEmployee.ID);
+            _logic.GetFilesmgrExt.file_Dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            _logic.GetFilesmgrExt.Add();
+            Databound();
+
+        }
+        catch (Exception)
+        {
+
+            lbuploadmessage.Text = "上传失败！";
+        } 
+    }
+    protected void GVFiles_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles != null)
+        {
+            if (GVFiles.DataKeys != null)
+            {
+                string id = GVFiles.DataKeys[e.RowIndex].Value.ToString();
+
+                fileObj.Initialize(int.Parse(id));
+                if(fileObj.GetFilesmgrExt.File_Emp != lem.GetEmployee.ID)
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('不可以删除他人的文档。 ');", true);
+                    return;
+                }
+                fileObj.GetFilesmgrExt.Delete();
+                Databound();
+            }
+        }
+       
+
+    }
+    // 查看附件
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+
+    void page_init()
+    {
+        Master.ScriptMgr.EnablePartialRendering = false;
+    }
+ 
+    protected void  btnQuery_Click(object sender, EventArgs e)
+    {
+        if( drplstProjDept.Items.Count ==0) return;
+        DataView dv;
+        string dept = drplstProjDept.SelectedValue;
+        dv = _logic.GetFilesmgrExt.GetFilesByEmpFileType(lem.GetEmployee.ID, Convert.ToInt32(drplstFileType.SelectedValue)).DefaultView;
+        if(lem.GetCanApproveDeptList().Contains(dept))  
+        dv = _logic.GetFilesmgrExt.GetFilesByDeptFileType(  Convert.ToInt32(dept), Convert.ToInt32(drplstFileType.SelectedValue)).DefaultView;
+
+        GVFiles.DataSource = dv;
+        GVFiles.DataBind();
+         
+
+
+    }
+}
diff --git a/Project/.svn/text-base/WorkReport.aspx.svn-base b/Project/.svn/text-base/WorkReport.aspx.svn-base
new file mode 100644
index 0000000..d40f18c
--- /dev/null
+++ b/Project/.svn/text-base/WorkReport.aspx.svn-base
@@ -0,0 +1,96 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="WorkReport.aspx.cs" Inherits="Project_WorkReport"  %>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+    <table class="Table_Border" width="800px" border="0">
+        <tr>
+            <td>
+                <asp:Label ID="Label1" runat="server" CssClass="Label" Text="所属部门"></asp:Label></td>
+            <td>
+                <asp:DropDownList id="drplstProjDept" runat="server" CssClass="DropDownList">
+                </asp:DropDownList></td>
+            <td>
+                 </td>
+            <td style="width: 13px">
+                </td>
+        </tr>
+         <tr>
+            <td>
+                <asp:Label ID="Label11" runat="server" CssClass="Label" Text="上传类型"></asp:Label></td>
+            <td>
+                <asp:DropDownList id="drplstFileType" runat="server" CssClass="DropDownList">
+                </asp:DropDownList>
+                &nbsp;&nbsp;
+                <asp:Button ID="btnQuery" runat="server" CssClass="Button" Text="查询" OnClick="btnQuery_Click" /></td>
+            <td>
+               </td>
+            <td style="width: 13px">
+                 </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label5" runat="server" CssClass="Label" Text="上传工作总结"></asp:Label></td>
+            <td align="left">
+                <asp:FileUpload ID="fileUpload" runat="server" /></td>
+            <td>
+                &nbsp;</td>
+            <td style="width: 13px">
+                &nbsp;</td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label6" runat="server" CssClass="Label" Text="附件说明"></asp:Label></td>
+            <td align="left">
+                <asp:TextBox ID="txtFileDesc" runat="server" CssClass="TextBox" MaxLength="25">
+                </asp:TextBox>&nbsp;
+                <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="上传" OnClick="btnFileUpload_Click" ValidationGroup="1" />
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtFileDesc"
+                    ErrorMessage="*" ValidationGroup="1">＊</asp:RequiredFieldValidator>
+                <asp:Label id="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+            <td align="left">
+            </td>
+            <td style="width: 13px">
+                &nbsp;</td>
+        </tr>
+        <tr>
+            <td colspan="4" class="ALine">
+                <br />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label7" runat="server" CssClass="Label" Text="相关附件"></asp:Label>&nbsp;</td>
+            <td colspan="3" align="left">
+                &nbsp;
+                <asp:GridView id="GVFiles" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+                    CssClass="DataGrid" DataKeyNames="pk_t_Filesmgr" OnRowDeleting="GVFiles_RowDeleting"
+                    OnSelectedIndexChanged="GVFiles_SelectedIndexChanged" PagerStyle-HorizontalAlign="Right"
+                    ShowFooter="True" Width="70%">
+                    <columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr"
+                                                                        HeaderText="文件id" Visible="false"></asp:BoundField>
+                                                                     <asp:BoundField ReadOnly="True" DataField="em_name" SortExpression="emp_name"
+                                                                        HeaderText="上传人"   ></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="文件说明"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="上传时间"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="可用"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=查看  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=删除 onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="编　辑">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </columns>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+                    <emptydatatemplate>
+                                                                    没有数据</emptydatatemplate>
+                    <selectedrowstyle cssclass="SelectedItemStyle" />
+                    <pagerstyle horizontalalign="Right" />
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+                    <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                </asp:GridView></td>
+        </tr>
+    </table>
+</asp:Content>
+
diff --git a/Project/.svn/text-base/复件 ProjectApprove.aspx.cspu.svn-base b/Project/.svn/text-base/复件 ProjectApprove.aspx.cspu.svn-base
new file mode 100644
index 0000000..071342d
--- /dev/null
+++ b/Project/.svn/text-base/复件 ProjectApprove.aspx.cspu.svn-base	
@@ -0,0 +1,836 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "PK_DEPARTMENT";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == Tracen.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+                    trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+                 _logic.GetProject.balanceThePercent();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);
+            _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+            
+        }
+
+        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgrExt.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgrExt.File_type + "/" + fileObj.GetFilesmgrExt.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/Project/.svn/text-base/复件 ProjectApprove.aspxpu.svn-base b/Project/.svn/text-base/复件 ProjectApprove.aspxpu.svn-base
new file mode 100644
index 0000000..9da1653
--- /dev/null
+++ b/Project/.svn/text-base/复件 ProjectApprove.aspxpu.svn-base	
@@ -0,0 +1,445 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"  EnableEventValidation = "true" 
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td nowrap>
+                            <asp:TextBox id="btnYear" runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged"
+                                Width="1px">
+                            </asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" /></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+                
+                <asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"  Text="����Excel" />
+                    
+                    
+                     </td>
+        </tr>
+        <div runat="server" id="ProjectDetail" visible="false" align="left">
+        </div>
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+        </div>
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="pk_t_Filesmgr" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="pk_t_Filesmgr" SortExpression="pk_t_Filesmgr" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+             </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                    ������¼</td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="3"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="4" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtApproveMem"
+                        ErrorMessage="�����������������" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+            </div>
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="false">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"
+                            Width="54px" visible="false">
+                        </asp:TextBox></td>
+                </tr>
+            <tr>
+                <td colspan="4">
+                    <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1"
+                        HeaderText="������ʾ">
+                    </asp:ValidationSummary>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                  <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                  </div>
+                </td>
+            </tr>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectApprove.aspx b/Project/ProjectApprove.aspx
new file mode 100644
index 0000000..3245510
--- /dev/null
+++ b/Project/ProjectApprove.aspx
@@ -0,0 +1,457 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="80%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"
+                                    	 ><ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+              <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+            </td>
+        </tr>
+           <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            </table>
+            <table width="75%" align="left">
+                 <div runat="server" id="ProjectDetail" visible="false" align="left"  >
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                   <asp:Label ID="lbapprovelst" runat="server" CssClass="Label" Text="������¼"></asp:Label>  </td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="90%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                  <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="true">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"  CausesValidation="True"     Width="1px" Text=1 visible="true"></asp:TextBox>
+                        <cc1:NumericUpDownExtender ID="NumericUpDownExtender2" runat="server" Width="80" Step="0.1" 
+                                TargetControlID="txtApproveScore">
+                            </cc1:NumericUpDownExtender> 
+                            
+                         <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtApproveScore"
+                                                            ErrorMessage="ϵ����Χ����0-1������" MaximumValue="1" MinimumValue="0"
+                                                             SetFocusOnError="True" ValidationGroup="1" Type="Double">*</asp:RangeValidator>
+                        </td>
+                </tr>
+                  
+                                         <tr>
+                                        <td  colspan=2 >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary> 
+                                        </td>
+                                        </tr>
+                                    
+                
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                   </div>
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectApprove.aspx.bak b/Project/ProjectApprove.aspx.bak
new file mode 100644
index 0000000..10572b2
--- /dev/null
+++ b/Project/ProjectApprove.aspx.bak
@@ -0,0 +1,456 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="80%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+              <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+            </td>
+        </tr>
+           <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            </table>
+            <table width="75%" align="left">
+                 <div runat="server" id="ProjectDetail" visible="false" align="left"  >
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                   <asp:Label ID="lbapprovelst" runat="server" CssClass="Label" Text="������¼"></asp:Label>  </td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="90%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                  <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="true">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"  CausesValidation="True"     Width="1px" Text=1 visible="true"></asp:TextBox>
+                        <cc1:NumericUpDownExtender ID="NumericUpDownExtender2" runat="server" Width="80" Step="0.1" 
+                                TargetControlID="txtApproveScore">
+                            </cc1:NumericUpDownExtender> 
+                            
+                         <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtApproveScore"
+                                                            ErrorMessage="ϵ����Χ����0-1������" MaximumValue="1" MinimumValue="0"
+                                                             SetFocusOnError="True" ValidationGroup="1" Type="Double">*</asp:RangeValidator>
+                        </td>
+                </tr>
+                  
+                                         <tr>
+                                        <td  colspan=2 >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary> 
+                                        </td>
+                                        </tr>
+                                    
+                
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                   </div>
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectApprove.aspx.cs b/Project/ProjectApprove.aspx.cs
new file mode 100644
index 0000000..aedb2a5
--- /dev/null
+++ b/Project/ProjectApprove.aspx.cs
@@ -0,0 +1,851 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "ID";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.EndsWith("δͨ��"));
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+//            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;   //2011.3.14 ��������ͨ��--���ѷ���״̬�� �൱�ڴ�xsl load.
+                //_logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+              
+                _logic.GetProject.Update();
+                 _logic.GetProject.balanceThePercent(); //do the percent balance
+                 _logic.GetProject.getModel();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+              //  _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);           
+       //     _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+       //     _logic.PaObj.pa_score = Convert.ToDecimal(txtSystemScore.Text) * Convert.ToDecimal(txtApproveScore.Text);
+            _logic.PaObj.pa_score = Convert.ToDecimal(txtApproveScore.Text) ;
+            if (_logic.GetProject.pj_nextDept == -1)
+            {
+                 _logic.GetProject.pj_score =_logic.GetProject.pj_score * _logic.PaObj.pa_score ;
+            }
+
+            
+        }
+
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+ //               trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+      
+}
+ 
\ No newline at end of file
diff --git a/Project/ProjectApprove.aspx.cs.bak b/Project/ProjectApprove.aspx.cs.bak
new file mode 100644
index 0000000..687576f
--- /dev/null
+++ b/Project/ProjectApprove.aspx.cs.bak
@@ -0,0 +1,851 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "ID";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.EndsWith("δͨ��"));
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+//            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;   //2011.3.14 ��������ͨ��--���ѷ���״̬�� �൱�ڴ�xsl load.
+                //_logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+              
+                _logic.GetProject.Update();
+                 _logic.GetProject.balanceThePercent(); //do the percent balance
+                 _logic.GetProject.getModel();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);           
+       //     _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+       //     _logic.PaObj.pa_score = Convert.ToDecimal(txtSystemScore.Text) * Convert.ToDecimal(txtApproveScore.Text);
+            _logic.PaObj.pa_score = Convert.ToDecimal(txtApproveScore.Text) ;
+            if (_logic.GetProject.pj_nextDept == -1)
+            {
+                 _logic.GetProject.pj_score =_logic.GetProject.pj_score * _logic.PaObj.pa_score ;
+            }
+
+            
+        }
+
+//        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+ //               trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+      
+}
+ 
\ No newline at end of file
diff --git a/Project/ProjectApprove.aspx.csb b/Project/ProjectApprove.aspx.csb
new file mode 100644
index 0000000..eeb5ffc
--- /dev/null
+++ b/Project/ProjectApprove.aspx.csb
@@ -0,0 +1,785 @@
+using System;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "ID";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+ //           using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+              //      _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+                {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);
+            _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+            
+        }
+
+ //       using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+//                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+   
+}
+ 
\ No newline at end of file
diff --git a/Project/ProjectApprove.aspxa b/Project/ProjectApprove.aspxa
new file mode 100644
index 0000000..515179b
--- /dev/null
+++ b/Project/ProjectApprove.aspxa
@@ -0,0 +1,436 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+               <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        
+        
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+                <!------ THE ADD /DELETE AREA ------>
+                <!------ THE ADD /DELETE AREA ------>
+            </td>
+        </tr>
+        <div runat="server" id="ProjectDetail" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        </div>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Date" SortExpression="File_Date" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        </div>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                    ������¼</td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="3"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="4" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="false">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"
+                            Width="54px" visible="false">
+                        </asp:TextBox></td>
+                </tr>
+            </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                    <!--input type="button" id="Button1" onClick="reset()" visible="false" class="Button"	value="ȡ���޸�" name="ButtonCancel"/-->
+                </td>
+            </tr>
+        </div>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectCenter.aspx b/Project/ProjectCenter.aspx
new file mode 100644
index 0000000..f69d1e5
--- /dev/null
+++ b/Project/ProjectCenter.aspx
@@ -0,0 +1,524 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectCenter.aspx.cs" Inherits="ProjectCenter" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td>
+              <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td>
+                            <table border="0">
+                                <tr>
+                                    <td valign="top">
+                                        <asp:TreeView id="TreeDeptEmp" runat="server" ShowLines="True" ImageSet="Arrows"
+                                            OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged">
+                                            <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                                            <nodes>
+                                    <asp:TreeNode Text="WMS" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+                                  </nodes>
+                                        </asp:TreeView></td>
+                                        <td width="1" class="VLine" ></td>
+                                    <td valign="top">
+                                        <table border="0" width="100%">
+                                            <tr>
+                                                <td>
+                                                    <table class="Table_NoBorder" border="0"  width="100%">
+                                                        <tr>
+                                                            <td>
+                                                                <asp:Label ID="Label121" runat="server" CssClass="Label" Text="��Ŀ���ƹ���"></asp:Label>
+                                                            </td>
+                                                            <td>
+                                                                <asp:TextBox ID="txtQryProjectName" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                    Width="245px"></asp:TextBox>
+                                                            </td>
+                                                            <td>
+                                                                <asp:Label ID="Label122" runat="server" CssClass="Label" Text="����״̬ѡ��" visible=false></asp:Label>
+                                                            </td>
+                                                            <td nowrap>
+                                                                <asp:RadioButtonList id="rdlstAssignQry" runat="server" RepeatDirection="Horizontal" visible=false>
+                                                                    <asp:ListItem Value="0" selected="True">ȫ��</asp:ListItem>
+                                                                    <asp:ListItem Value="1">�ѷ���</asp:ListItem>
+                                                                    <asp:ListItem Value="-1">���</asp:ListItem>
+                                                                </asp:RadioButtonList>
+                                                            </td>
+                                                            <td>
+                                                                <asp:Button ID="btnQuery" runat="server" CssClass="Button" Text="��ѯ" OnClick="btnQuery_Click" />
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td colspan="5">
+                                                                <asp:GridView id="GridView1" CssClass="DataGrid" PageSize="20" PagerStyle-HorizontalAlign="Right"
+                                                                    runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                                                    AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                                                    OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                                                    Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                                                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                                                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                                                                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                                                                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                                                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid" Visible="false" >  </asp:BoundField>
+		                                                      
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�鿴" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  title= ��Ŀ��Ϣ &gt;" 
+				��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=������Ϣ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />                </asp:CommandField>
+			</columns>
+                                                                    <pagerstyle horizontalalign="Right" />
+                                                                </asp:GridView> <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />
+                                                                
+                                                                     
+                                                            </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        
+                                    <table>
+                                       <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" width="100%">
+                                            <table width="90%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="474px"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="*">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="True">0</asp:TextBox>
+                                                                    %&nbsp;
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="True">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox" MaxLength="25"
+                                                                        ReadOnly="true">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px">
+                                                                    </asp:TextBox>
+                                                                    %</td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td style="height: 45px">
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;
+                                                    </td>
+                                                    <td>
+                                                        &nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server">
+                                                        </asp:TextBox>
+                                                        %
+                                                    </td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                            runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                            Width="70%" ShowFooter="True" AutoGenerateColumns="False">
+                                                            <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowDeleteButton="False" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�鿴">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                                                            <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                                            <emptydatatemplate> û������</emptydatatemplate>
+                                                            <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                                            <pagerstyle horizontalalign="Right" />
+                                                            <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                                            <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                                        </asp:GridView></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" align="center">
+                                                        <div runat="server" id="projMonthDetailEdit">
+                                                            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                                                            <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater id="RepeaterApproveList" runat="server">
+                                                        <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td>ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                 
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                                    </table>
+                                        
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                        <td>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3"  >
+                            <table  >
+                                <tr>
+                                    <td>
+                                        <asp:Label ID="Label51" runat="server" CssClass="Label" Text="�ϴ���Ŀ"></asp:Label></td>
+                                    <td align="left">
+                                        <asp:FileUpload ID="fileUpload1" runat="server" /></td>
+                                    <td>
+                                        &nbsp;<asp:Button ID="btnFileUpload1" runat="server" CssClass="Button" Text="�ϴ�"
+                                            OnClick="btnFileUpload1_Click" /></td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td align="left">
+                                        <asp:Label ID="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+                                    <td align="left">
+                                    </td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                 
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectCenter.aspx.cs b/Project/ProjectCenter.aspx.cs
new file mode 100644
index 0000000..a526c11
--- /dev/null
+++ b/Project/ProjectCenter.aspx.cs
@@ -0,0 +1,1017 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectCenter :  PageBase
+    {
+        private LProject _logic;
+    
+  
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+
+            }
+            SessionSeting();
+
+          
+
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+    
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource =  getProjects();
+            GridView1.DataBind();
+            UpdateSession();
+           
+           // ProjectDataBind();
+         //   ProjectDetailDataBind();
+            //    btnSubmit.Enabled = false;
+           ClearProjDetailData();
+           ClearProjData();
+            intializeProjectMasterDept();
+        }
+
+    /// <summary>
+    /// ��������ȡ��Ӧ����Ŀ��Ϣ
+    /// </summary>
+    /// <returns></returns>
+     DataView  getProjects()
+       {
+           if (TreeDeptEmp.Nodes.Count == 0) return new DataView();
+           DataView dv = _logic.GetProjectsByYearMonth( btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        string selectDept = string.Empty;
+        string selectEmp = string.Empty;
+        string inputProjectName = string.Empty;
+        string rowFilter = string.Empty;
+
+
+       
+
+         if(rdlstAssignQry.SelectedValue=="0")  //all assigned and unassigned
+         {
+             
+              //�趨Ա���Ͳ�������
+           if( TreeDeptEmp.SelectedNode != null)
+             if(TreeDeptEmp.SelectedNode.Text.StartsWith(".")) //employee
+             {
+                 rowFilter = "pj_master = " + TreeDeptEmp.SelectedValue;
+             }
+             else
+             {
+                 rowFilter = "pj_dept =" + TreeDeptEmp.SelectedValue;
+             }
+
+        }
+         else
+         {
+             if (rdlstAssignQry.SelectedValue == "1") //assigned 
+                 rowFilter = "pj_status ='" + ProjectStatus.��Ŀ�ѷ��� +"'";
+             else
+                 rowFilter = "pj_status ='" + ProjectStatus.��Ŀδ���� +"'";
+         }
+
+             //�趨��Ŀ���ƹ���
+             if(txtQryProjectName.Text.Trim().Length>0)
+             {
+                 if(rowFilter.Length>0)
+                 {
+                     rowFilter += " and ";
+
+                 }
+                 
+             rowFilter += " pj_name like '%" + txtQryProjectName.Text.Trim() + "%'";
+                  
+             }
+
+
+        dv.RowFilter = rowFilter;
+           return dv;
+       }
+
+      
+
+
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+         
+        void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            intializeProjectMasterDept();
+           bindDeptEmp();
+           validDeptEmp();
+        }
+
+      void validDeptEmp()
+      {
+          if(lem.CanManageProjects) return;
+         
+      }
+
+    
+
+      void intializeProjectMasterDept()
+      {
+          txtProjMaster.Text = "";
+          drplstProjDept.Items.Clear();
+          if (TreeDeptEmp.SelectedValue == "0") return;
+          if (TreeDeptEmp.SelectedNode != null)
+              if (TreeDeptEmp.SelectedNode.Text.StartsWith(".")) //employee
+              {
+                  LEmployee tmp = new LEmployee();
+                  tmp.Initialize(Convert.ToInt32(TreeDeptEmp.SelectedValue));
+                  drplstProjDept.DataSource = tmp.GetEmployee.GetDepartments();
+                  drplstProjDept.DataTextField = "DEP_NAME";
+                  drplstProjDept.DataValueField = "ID";
+                  drplstProjDept.DataBind();
+
+                  txtProjMaster.Text = TreeDeptEmp.SelectedNode.Text.Substring(1).Replace("<strong>","").Replace("</strong>",string.Empty);  
+              }
+              else
+              {
+                  string dept = TreeDeptEmp.SelectedNode.Text.Substring(4);
+                   dept = dept.Substring(0, dept.Length -5);
+                  drplstProjDept.Items.Add(new ListItem(dept,TreeDeptEmp.SelectedNode.Value)); 
+              }
+      }
+
+    /// <summary>
+        /// �󶨲��ż��û�
+        /// </summary>
+        private void bindDeptEmp()
+        {
+            TreeDeptEmp.Nodes.Clear();
+            if (lem.CanManageProjects) //ӵ�й�����Ŀ�Ľ�ɫ����Կ���������Ŀ
+                BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode, lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+ 
+            else
+                 BindEmpTree(TreeDeptEmp, Util.buildWhereIntIn(lem.GetCanApproveDeptList()), TreeDeptEmp.SelectedNode, lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+
+        if (TreeDeptEmp.Nodes.Count >0) TreeDeptEmp.Nodes[0].Selected = true;
+        }
+
+
+
+        public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv, DataView empdv)
+        {
+            if (lem.CanManageProjects)
+            {
+                deptdv.RowFilter = "dep_mastdept in (" + id + ")";
+            }
+            else
+            {
+                if (id == string.Empty) return;
+                deptdv.RowFilter = "dep_mastdept in (" + id + ")";
+
+                if (pNode == null)
+                    deptdv.RowFilter = "ID in (" + id + ")";
+            }
+
+
+            foreach (DataRowView row in deptdv)
+            {
+                TreeNode node = new TreeNode();
+                node.Text = "<em>" + row["dep_name"] + "</em>";
+                node.Value = row["ID"].ToString(); 
+                node.ShowCheckBox = false;
+                node.Expanded = false;
+                empdv.RowFilter = "de_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode(".<strong>" + emrow["em_name"].ToString() +"</strong>" , emrow["ID"].ToString());
+                    node.ChildNodes.Add(tnEmp);
+                }
+                if (pNode == null)
+                //˵���Ǹ��ڵ�
+                { 
+                    tree.Nodes.Add(node); 
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                
+                BindEmpTree(tree,  node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+            }
+        }
+
+
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                //           _logic = (LEmployee)Session[appScope.PagelevelObj];
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+//        Session[appScope.PagelevelObj] = _logic;
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+          //  txtProjMaster.Text = lem.GetEmployee.em_name;
+           txtProjPercent.Text = _logic.GetProject.pj_percent.ToString() ;
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+
+            ApproveListBind(_logic.GetProject.ID);
+
+            
+           
+        }
+    void ApproveListBind(int id)
+    {
+        RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+        RepeaterApproveList.DataBind();
+        panelApprovelist.Visible = true;
+    }
+        /// <summary>
+        /// ҳ�����Ŀ������Ϣ������Ϣ�ش�����Ŀʵ��
+        ///  
+        /// </summary>
+        void SetProjectDataBack()
+        {
+
+            //if (_logic.GetProject.ID > 0)
+            //{
+            //    _logic.GetProject.lastmodified = DateTime.Now.ToString();
+
+            //} 
+
+            //    ProjectDetail.Visible = true;
+            _logic.GetProject.pj_name  = txtProjectName.Text;
+            _logic.GetProject.pj_planStartDate =  drpdProjlisFromYear.SelectedValue +"-" + drplstProjFromMonth.SelectedValue +"-01"; 
+            _logic.GetProject.pj_planEndDate = drplstProjectToYear.SelectedValue +"-" + drlstProjToMonth.SelectedValue +"-01";
+            _logic.GetProject.pj_master = lem.GetEmployee.ID;
+            _logic.GetProject.pj_mem =txtPrjDesc.Text;
+            //   _logic.GetProject.pj_progress  =   Convert.ToInt32(txtProjProgress.Text)  ;  //��Ŀ����
+            _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text) ;               //��ĿȨ��
+            _logic.GetProject.pj_type = drplstProjType.SelectedValue;
+            _logic.GetProject.pj_status =   ProjectStatus.����δ�ύ;
+            _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+            _logic.GetProject.pj_dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment( _logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if(dep.GetDepartment.dep_mastdept==0) //û���ϼ�����
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                }
+            }
+            _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text);
+            lbuploadmessage.Text = "";
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+            btnSubmit.Visible = true;
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+           
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+            btnSubmit.Visible = false;
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            panelApprovelist.Visible = false;
+           
+          
+        }
+
+
+        private void SetProjectDetailBack()
+        {
+            //if (_logic.GetProjectDetail.ID > 0)
+            //{
+            //    _logic.GetProjectDetail.lastmodified = DateTime.Now.ToString();
+
+            //} 
+ 
+            _logic.GetProject.pj_progress = Convert.ToInt32(txtPrjProgress.Text) ;
+            _logic.GetProject.pj_finishDate =txtPdActualEndDate.Text  ;
+            _logic.GetProjectDetail.pd_planTarget =txtPdPlanTarget.Text  ;
+            _logic.GetProjectDetail.pd_finishedTarget = txtPdFinishTarget.Text  ;
+            _logic.GetProjectDetail.pd_percent =Convert.ToInt32(txtPdPercent.Text)  ;
+            _logic.GetProjectDetail.pd_mem =txtPdMem.Text ;
+            //����ʱstatusĬ��Ϊ��δ�ύ��
+            lbuploadmessage.Text = "";
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            ClearProjData();
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            validProjControles();
+            intializeProjectMasterDept();
+            lbuploadmessage.Text = "";
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+        /// <summary>
+        /// ������Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnProjSubmit_Click(object sender, EventArgs e)
+        {
+          
+            //�����Ŀ״̬��û�б仯���仯���������档
+           if(!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����) )
+           {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "�Ѿ������䣬�������޸ģ�����ʧ�ܡ�');", true);
+              return;
+           }
+           
+            
+                LProject lp = new LProject();
+                lp.GetProject.ID =_logic.GetProject.ID;
+                lp.GetProject.getModel();
+                if(!lp.GetProject.pj_status.Equals(_logic.GetProject.pj_status))
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('������������Ŀ  " + _logic.GetProject.pj_name + "�Ѿ��������޸ģ�����ʧ�ܡ�');", true);
+                    _logic.Initialize(_logic.GetProject.ID);
+                    Databound();
+                    ProjectDataBind();
+                    return;
+                }
+            
+             SetProjectDataBack(); 
+            if (_logic.GetProject.ID > 0) _logic.UpdateProject(); else _logic.AddProject();
+            ClearProjData();
+            Databound();
+        
+        }
+
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+        {
+            /*
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.ID = e.Row.Cells[0].Text.Trim();
+                string pdstatus = e.Row.Cells[13].Text.Trim();
+                chk.Enabled = (pdstatus == ProjectDetailStatus.�¶�δ�ύ || pdstatus == ProjectDetailStatus.����δͨ�� ||
+                               pdstatus == ProjectDetailStatus.���δͨ�� || pdstatus == ProjectDetailStatus.Ԥ��δͨ��);
+                e.Row.Cells[1].Controls.Add(chk);
+            }
+            */
+        }
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnReset_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+
+        /// <summary>
+        /// delete the project and details
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����))
+                {
+
+                    _logic.GetProject.Delete();
+                }
+            }
+
+            Databound();
+             
+        }
+
+        /***************************************** internal methods ********************************************/
+ 
+
+        private void chgOperTxt(bool addNew)
+        {
+         
+          
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+            btnSaveNewProj.Enabled = false;
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+            panelApprovelist.Visible = false;
+
+            drplstProjDept.Items.Clear();
+            lbuploadmessage.Text = "";
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+           if(drdlst.SelectedIndex>=0) 
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+           // btnSaveNewProj.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+           // btnDelete.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+            validProjControles();
+            btnSubmit.Visible = false;
+      
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            validPdControles();
+        }
+    void validProjControles()
+    {
+        divEditProject.Visible = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����)  ; 
+        txtProjectName.ReadOnly =!divEditProject.Visible;
+        drpdProjlisFromYear.Enabled = divEditProject.Visible;
+        drplstProjFromMonth.Enabled = divEditProject.Visible;
+        drplstProjectToYear.Enabled = divEditProject.Visible;
+        drlstProjToMonth.Enabled = divEditProject.Visible;
+        drplstProjType.Enabled = divEditProject.Visible;
+        txtPrjDesc.ReadOnly =!divEditProject.Visible;
+        txtProjProgress.ReadOnly =!divEditProject.Visible; //��Ŀ����
+        txtProjPercent.ReadOnly =!divEditProject.Visible; //��ĿȨ��
+        SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+        txtProjMem4delete.ReadOnly =!divEditProject.Visible; //����δ�ύ;
+        //  lbprjmem4Delete.Visible = divEditProject.Visible;
+        drplstProjDept.Enabled = divEditProject.Visible;
+        txtProjMaster.ReadOnly =!divEditProject.Visible;
+    }
+    void validPdControles()
+    {
+    //--monthly detail.
+        projMonthDetailEdit.Visible =  false;
+        txtPdName.ReadOnly =!projMonthDetailEdit.Visible;
+        txtPdStartDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdEndDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPrjProgress.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdActualEndDate.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdPlanTarget.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdFinishTarget.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdPercent.ReadOnly =! projMonthDetailEdit.Visible ;
+        txtPdMem.ReadOnly =! projMonthDetailEdit.Visible ;
+         
+      
+
+    }
+
+
+        /// <summary>
+        /// project detail 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            SetProjectDetailBack();
+           
+            _logic.GetProjectDetail.Update();
+            ClearProjDetailData();
+            Databound();
+        }
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        
+
+        protected void btnToApprove_Click(object sender, EventArgs e)
+        {
+       //       _logic.GetProject.ID = Convert.ToInt32(GridView1.Rows[1].Cells[0].Text.Trim());
+
+
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if(  _logic.GetProject.pj_status.EndsWith("δ�ύ")||  _logic.GetProject.pj_status.EndsWith("δͨ��") )
+                {
+                    _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                    //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                    {
+                        _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                        if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                            _logic.GetProject.Update();
+                            continue; //�����쵼��������
+                        }
+                    }
+                    //����������ύ�������쵼��׼
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                    _logic.GetProject.Update();
+                }
+            }
+             
+            Databound();
+
+
+        }
+
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void btnpdToApprove_Click(object sender, EventArgs e)
+    {
+
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��"))
+            {
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                {
+                    _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                    if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                    {
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��; 
+                        _logic.GetProject.Update();
+                        _logic.GetProjectDetail.Update();
+                        continue;  //�����쵼��������
+                    }
+                }
+                //����������ύ�������쵼��׼
+                _logic.GetProject.Update();
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                _logic.GetProjectDetail.Update();
+            }
+        }
+
+        Databound();
+
+    }
+    protected void btnpd2approve_Click(object sender, EventArgs e)
+    {
+
+    }
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        intializeProjectMasterDept();
+        Databound();
+    }
+    protected void btnQuery_Click(object sender, EventArgs e)
+    {
+        Databound();
+    }
+    protected void btnAssign_Click(object sender, EventArgs e)
+    {
+
+        if (TreeDeptEmp.SelectedNode == null || TreeDeptEmp.SelectedNode != null && TreeDeptEmp.SelectedValue == "0" || TreeDeptEmp.SelectedNode.Parent.Value=="0")
+        {
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��ѡ���������Ŀ�������ˡ�');", true);
+            return;
+        } 
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����) )
+            {
+               
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;
+                _logic.GetProject.pj_master = Convert.ToInt32(TreeDeptEmp.SelectedValue);
+                _logic.GetProject.pj_dept = Convert.ToInt32(TreeDeptEmp.SelectedNode.Parent.Value);
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+
+
+    }
+    protected void btnUnAssign_Click(object sender, EventArgs e)
+    {
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����))
+            {
+
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ����; 
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+    }
+  
+    protected void btnFileUpload1_Click(object sender, EventArgs e)
+    {
+        const string projectDest = "~/upload/projects/";
+        if (fileUpload1.FileName.Length==0) return;
+        lbuploadmessage.Text = "";
+        DirectoryInfo dir = new DirectoryInfo(Server.MapPath(projectDest));
+        if (!dir.Exists)
+            dir.Create();
+        string fileSavePath = Server.MapPath(projectDest + fileUpload1.FileName);
+        fileUpload1.SaveAs(fileSavePath);
+     //   Master.ScriptMgr.EnablePartialRendering = true;
+       // pdUpload.Visible = false;
+
+
+
+        importProjects(fileSavePath);
+        lbuploadmessage.Text = "�ϴ��ɹ���";
+        Databound();
+        
+        System.IO.File.Delete(fileSavePath);
+
+    }
+
+    void importProjects(string fileName)
+    {
+            int Count = 1;
+            string tableName = string.Empty;
+        try
+        { 
+            
+        DataSet ds = Util.Excel2DataSet(fileName);
+        foreach (DataTable dt in ds.Tables)
+        {
+
+            Count = 1;
+            tableName = dt.TableName;
+            foreach (DataRow dr in dt.Rows)
+            {
+                Count++; 
+                _logic.Initialize();
+                if (dr["���Ŵ���"].ToString().Length>0)
+                _logic.GetProject.pj_dept = Convert.ToInt32(dr["���Ŵ���"].ToString());
+                 if (dr["��Ա���"].ToString().Length > 0)
+                _logic.GetProject.pj_master = Convert.ToInt32(dr["��Ա���"].ToString());
+                  _logic.GetProject.pj_mem = dr["��Ŀ����"].ToString().Substring(0,500);
+                _logic.GetProject.pj_name = dr["��Ŀ����"].ToString().Substring(0,50);
+                if (dr["��ĿȨ��"].ToString().Length > 0)
+                _logic.GetProject.pj_percent = Convert.ToInt32(dr["��ĿȨ��"].ToString());
+                _logic.GetProject.pj_type = dr["��Ŀ����"].ToString();
+                _logic.GetProject.pj_nextDept =-1; //��������
+                if (_logic.GetProject.pj_master >0) _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ѷ���;
+                else
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+
+                _logic.GetProject.pj_planStartDate = dr["��Ŀ��ʼ���"].ToString().Trim()  + "-" + dr["��Ŀ��ʼ�·�"].ToString().Trim()  + "-01";
+                _logic.GetProject.pj_planEndDate = _logic.GetProject.pj_planStartDate;
+               
+                Convert.ToDateTime(_logic.GetProject.pj_planStartDate).AddMonths(Convert.ToInt32(dr["��ĿȨ��"].ToString()));
+                _logic.AddProject(); 
+            }
+        }
+
+        }
+        catch (Exception )
+        {
+            string errorMsg = "����  " + tableName +"�� "+ Count  +" ���д��󣬼����������ԡ�";
+            lbuploadmessage.Text = lbuploadmessage.Text + errorMsg;
+            throw;
+        //    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('"+ errorMsg+"');", true);
+          
+             
+        }
+       
+
+
+    }
+
+
+   
+    
+    protected void btnActive_Click(object sender, EventArgs e)
+    {
+     foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+            if (!_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ�ⶳ))
+            {
+
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ�ⶳ;
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+        //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+    protected void Page_Init()
+    {
+ ������
+     //   PostBackTrigger trigger = new PostBackTrigger();
+    //   trigger.ControlID = Button1.UniqueID;
+    //    ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+
+    void page_init()
+    {
+       ��Master.ScriptMgr.EnablePartialRendering = false;
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+    }
+
+
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/Project/ProjectMain.aspx b/Project/ProjectMain.aspx
new file mode 100644
index 0000000..62c10a2
--- /dev/null
+++ b/Project/ProjectMain.aspx
@@ -0,0 +1,484 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectMain.aspx.cs" Inherits="ProjectMain" EnableEventValidation = "false" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%"   class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td colspan="3" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:GridView ID="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Left"></HeaderStyle>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="left"></RowStyle>
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                <Columns>
+                                    <asp:BoundField DataField="pk_projDetail" HeaderText="pdid" Visible="false"></asp:BoundField>
+                                    <asp:TemplateField>
+                                        <HeaderTemplate>
+                                            <!--input   id="selectAll"   onclick="SelectAll(this)"   type="checkbox"   value="ȫѡ"   /-->
+                                            ѡ��
+                                        </HeaderTemplate>
+                                        <HeaderStyle HorizontalAlign="Left" Wrap="False" />
+                                        <ItemTemplate>
+                                            <input id="checkNews" type="checkbox" runat="server" />
+                                        </ItemTemplate>
+                                        <ItemStyle HorizontalAlign="Left" />
+                                    </asp:TemplateField>
+                                    <asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="dep_name" HeaderText="����" ItemStyle-HorizontalAlign="Left"
+                                        SortExpression="dep_name">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"
+                                    	 >
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;"
+                                        ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                                        <HeaderStyle HorizontalAlign="Center" />
+                                        <ItemStyle HorizontalAlign="Center" Wrap="False" />
+                                    </asp:CommandField>
+                                </Columns>
+                                <EmptyDataTemplate>
+                                    û������</EmptyDataTemplate>
+                                <PagerStyle HorizontalAlign="Right" />
+                            </asp:GridView>
+                            <asp:Button ID="btn_addNew" runat="server" Text="������Ŀ" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="btnPrjToApprove" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnToApprove_Click" />
+                            <asp:Button ID="btnpdToApprove" runat="server" CssClass="Button" Text="��Ŀ�ύ" OnClick="btnpdToApprove_Click" />
+                            <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" Width="100%">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td    >
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label> 
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="534px" CausesValidation="True"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="��������Ŀ����" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True" CausesValidation="True">0</asp:TextBox>% 
+                                                                    </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True"></asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="true"></asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px" CausesValidation="True">0</asp:TextBox>
+                                                                    %<asp:RangeValidator id="RangeValidator3" runat="server" ControlToValidate="txtProjPercent"
+                                                            ErrorMessage="��ĿȨ��ֻ����0-100�����֡�" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtProjPercent"
+                                                                        ErrorMessage="��������ĿȨ��" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td >
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtProjMem4delete"
+                                                                        ErrorMessage="������ɾ����Ŀ������˵��" SetFocusOnError="True" ValidationGroup="3">*</asp:RequiredFieldValidator>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" ValidationGroup="1" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                            <asp:Button ID="btnpj2approve" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnpj2approve_Click1" ValidationGroup="1" Visible="False" />
+                                                            <asp:Button ID="btnDelete" runat="server" CssClass="Button" Text="ɾ��" OnClick="btnDelete_Click" ValidationGroup="3" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server" CausesValidation="True"></asp:TextBox>
+                                                        %
+                                                        
+                                                        <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�����ٷֱ�ֻ����0-100������1" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                        <asp:RequiredFieldValidator id="RequiredFieldValidator3" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�������¶���ɰٷֱ�" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                       </tr>
+                                                       
+                                                       <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="���� "></asp:Label></td>
+                                                        <td align="left">
+                                                            <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="�ϴ�" OnClick="btnFileUpload_Click" />
+                                                            <asp:Button ID="btnFileUploadReferesh" runat="server" CssClass="Button" Text="ˢ�¸����б�" OnClick="btnFileUploadReferesh_Click1" /></td>
+                                                        <td align="left">
+                                                            &nbsp;</td>
+                                                        <td>
+                                                            &nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                        <td colspan="3" align="left">
+                                                            <asp:GridView ID="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                                runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                                Width="70%" ShowFooter="True" AutoGenerateColumns="False" OnRowDeleting="GVFiles_RowDeleting">
+                                                                <Columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID"
+                                                                        HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </Columns>
+                                                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                                                                <EmptyDataTemplate>
+                                                                    û������</EmptyDataTemplate>
+                                                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                                                <PagerStyle HorizontalAlign="Right" />
+                                                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+                                                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                                            </asp:GridView>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" class="ALine">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" align="center">
+                                                            <div runat="server" id="projMonthDetailEdit">
+                                                                <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                                <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" ValidationGroup="1" /></div>
+                                                        </td>
+                                                    </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <table align="left" >
+                                         <tr>
+                                        <td   >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary><asp:ValidationSummary id="ValidationSummary2" runat="server" ValidationGroup="3" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                   
+                                        </table>
+                                        <br />
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater ID="RepeaterApproveList" runat="server">
+                                                        <ItemTemplate>
+                                                               <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                        </ItemTemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div></asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectMain.aspx.bak b/Project/ProjectMain.aspx.bak
new file mode 100644
index 0000000..532c5e6
--- /dev/null
+++ b/Project/ProjectMain.aspx.bak
@@ -0,0 +1,483 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"
+    CodeFile="ProjectMain.aspx.cs" Inherits="ProjectMain" EnableEventValidation = "false" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%"   class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td colspan="3" align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <asp:GridView ID="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                runat="server" AutoGenerateColumns="False" DataKeyNames="pk_projDetail" OnRowDeleting="GridView1_EditProject"
+                                AllowPaging="True" OnPageIndexChanging="GridView1_PageIndexChanging" OnRowDataBound="GridView1_RowDataBound"
+                                OnSorting="GridView1_Sorting" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                                Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Left"></HeaderStyle>
+                                <RowStyle CssClass="ItemStyle" HorizontalAlign="left"></RowStyle>
+                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                <Columns>
+                                    <asp:BoundField DataField="pk_projDetail" HeaderText="pdid" Visible="false"></asp:BoundField>
+                                    <asp:TemplateField>
+                                        <HeaderTemplate>
+                                            <!--input   id="selectAll"   onclick="SelectAll(this)"   type="checkbox"   value="ȫѡ"   /-->
+                                            ѡ��
+                                        </HeaderTemplate>
+                                        <HeaderStyle HorizontalAlign="Left" Wrap="False" />
+                                        <ItemTemplate>
+                                            <input id="checkNews" type="checkbox" runat="server" />
+                                        </ItemTemplate>
+                                        <ItemStyle HorizontalAlign="Left" />
+                                    </asp:TemplateField>
+                                    <asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="dep_name" HeaderText="����" ItemStyle-HorizontalAlign="Left"
+                                        SortExpression="dep_name">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"
+                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status">
+                                        <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                                        <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                                    </asp:BoundField>
+                                    <asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;"
+                                        ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                                        <HeaderStyle HorizontalAlign="Center" />
+                                        <ItemStyle HorizontalAlign="Center" Wrap="False" />
+                                    </asp:CommandField>
+                                </Columns>
+                                <EmptyDataTemplate>
+                                    û������</EmptyDataTemplate>
+                                <PagerStyle HorizontalAlign="Right" />
+                            </asp:GridView>
+                            <asp:Button ID="btn_addNew" runat="server" Text="������Ŀ" CssClass="Button" OnClick="btnAddnew_Click" />
+                            <asp:Button ID="btnPrjToApprove" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnToApprove_Click" />
+                            <asp:Button ID="btnpdToApprove" runat="server" CssClass="Button" Text="��Ŀ�ύ" OnClick="btnpdToApprove_Click" />
+                            <asp:Button ID="Button1" runat="server" CssClass="Button" OnClick="Excel_Click" Text="����Excel" />&nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" class="ALine">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" align="center">
+                            <!------ THE ADD /DELETE AREA ------>
+                            <!------ THE ADD /DELETE AREA ------>
+                            <table width="100%" class="Table_NoBorder">
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectDetail" runat="server" Visible="false" align="left" Width="100%">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td    >
+                                                        <table width="100%" class="Table_NoBorder">
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label> 
+                                                                </td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                                                                        Width="534px" CausesValidation="True"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtProjectName"
+                                                                        ErrorMessage="��������Ŀ����" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                                                                        Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                                <td>
+                                                                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                                                                        Width="52px" Enabled="False">
+                                                                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                                                                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                                                                        <asp:ListItem>2011</asp:ListItem>
+                                                                    </asp:DropDownList>
+                                                                    ��
+                                                                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px" Enabled="False">
+                                                                        <asp:ListItem Value="1">1</asp:ListItem>
+                                                                        <asp:ListItem>2</asp:ListItem>
+                                                                        <asp:ListItem>3</asp:ListItem>
+                                                                        <asp:ListItem Value="4">4</asp:ListItem>
+                                                                        <asp:ListItem>5</asp:ListItem>
+                                                                        <asp:ListItem>6</asp:ListItem>
+                                                                        <asp:ListItem>7</asp:ListItem>
+                                                                        <asp:ListItem>8</asp:ListItem>
+                                                                        <asp:ListItem>9</asp:ListItem>
+                                                                        <asp:ListItem>10</asp:ListItem>
+                                                                        <asp:ListItem>11</asp:ListItem>
+                                                                        <asp:ListItem>12</asp:ListItem>
+                                                                    </asp:DropDownList>��</td>
+                                                            </tr>
+                                                            
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True" CausesValidation="True">0</asp:TextBox>% 
+                                                                    </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="True"></asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox " MaxLength="25"
+                                                                        ReadOnly="true"></asp:TextBox>
+                                                                </td>
+                                                                <td>
+                                                                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                                                                    </asp:DropDownList></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                                                                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                                                                        <asp:ListItem>��������</asp:ListItem>
+                                                                    </asp:DropDownList></td>
+                                                                <td>
+                                                                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                                                                </td>
+                                                                <td align="left">
+                                                                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                                                                        Width="26px" CausesValidation="True">0</asp:TextBox>
+                                                                    %<asp:RangeValidator id="RangeValidator3" runat="server" ControlToValidate="txtProjPercent"
+                                                            ErrorMessage="��ĿȨ��ֻ����0-100�����֡�" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtProjPercent"
+                                                                        ErrorMessage="��������ĿȨ��" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td >
+                                                                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                                <td colspan="3" style="height: 45px" align="left">
+                                                                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                                                                        TextMode="MultiLine" Width="542px">
+                                                                    </asp:TextBox>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td nowrap>
+                                                                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                                                                    </asp:Label></td>
+                                                                <td colspan="3" align="left">
+                                                                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                                                                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false"></asp:TextBox>
+                                                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtProjMem4delete"
+                                                                        ErrorMessage="������ɾ����Ŀ������˵��" SetFocusOnError="True" ValidationGroup="3">*</asp:RequiredFieldValidator>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td class="ALine" colspan="4">
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <div id="divEditProject" runat="server" align="Center">
+                                                            <asp:Button ID="btnSaveNewProj" runat="server" CssClass="Button" Text="��������" OnClick="btnProjSubmit_Click" ValidationGroup="1" />
+                                                            <!-- input type="button" id="btnResetNewPrj" onclick="reset()"   class="Button" visible="false"
+                                                            value="ȡ���޸�" name="ButtonCancel" / -->
+                                                            &nbsp;
+                                                            <asp:Button ID="btnpj2approve" runat="server" CssClass="Button" Text="������Ŀ�ύ" OnClick="btnpj2approve_Click1" ValidationGroup="1" Visible="False" />
+                                                            <asp:Button ID="btnDelete" runat="server" CssClass="Button" Text="ɾ��" OnClick="btnDelete_Click" ValidationGroup="3" /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Panel ID="ProjectMonthDetail" runat="server" Width="100%" Visible="false" align="left">
+                                            <table width="80%" class="Table_NoBorder">
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPrjProgress" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdStartDate" CssClass="TextBox " runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox " MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td>
+                                                        <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtPdPercent" runat="server" CausesValidation="True"></asp:TextBox>
+                                                        %
+                                                        
+                                                        <asp:RangeValidator id="RangeValidator1" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�����ٷֱ�ֻ����0-100������1" MaximumValue="100" MinimumValue="0" SetFocusOnError="True" ValidationGroup="1" Type="Integer">*</asp:RangeValidator>
+                                                        <asp:RequiredFieldValidator id="RequiredFieldValidator3" runat="server" ControlToValidate="txtPdPercent"
+                                                            ErrorMessage="�������¶���ɰٷֱ�" ValidationGroup="1">*</asp:RequiredFieldValidator></td>
+                                                    <td align="left" colspan="2">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                                                    <td colspan="3" align="left">
+                                                        <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                                                            TextMode="MultiLine" Width="614px">
+                                                        </asp:TextBox></td>
+                                                       </tr>
+                                                       
+                                                       <tr>
+                                                    <td colspan="4" class="ALine">
+                                                    </td>
+                                                </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label6" runat="server" CssClass="Label" Text="���� "></asp:Label></td>
+                                                        <td align="left">
+                                                            <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="�ϴ�" OnClick="btnFileUpload_Click" />
+                                                            <asp:Button ID="btnFileUploadReferesh" runat="server" CssClass="Button" Text="ˢ�¸����б�" OnClick="btnFileUploadReferesh_Click1" /></td>
+                                                        <td align="left">
+                                                            &nbsp;</td>
+                                                        <td>
+                                                            &nbsp;</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>
+                                                            <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                                                        <td colspan="3" align="left">
+                                                            <asp:GridView ID="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                                                                runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GVFiles_SelectedIndexChanged"
+                                                                Width="70%" ShowFooter="True" AutoGenerateColumns="False" OnRowDeleting="GVFiles_RowDeleting">
+                                                                <Columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID"
+                                                                        HeaderText="�ļ�id" Visible="false"></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </Columns>
+                                                                <RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+                                                                <EmptyDataTemplate>
+                                                                    û������</EmptyDataTemplate>
+                                                                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+                                                                <PagerStyle HorizontalAlign="Right" />
+                                                                <HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+                                                                <AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+                                                            </asp:GridView>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" class="ALine">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan="4" align="center">
+                                                            <div runat="server" id="projMonthDetailEdit">
+                                                                <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                                <asp:Button ID="btnpd2approve" runat="server" CssClass="Button" Text="�¶��ύ" OnClick="btnpd2approve_Click" ValidationGroup="1" /></div>
+                                                        </td>
+                                                    </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        <table align="left" >
+                                         <tr>
+                                        <td   >
+                                        <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1" HeaderText="������ʾ"></asp:ValidationSummary><asp:ValidationSummary id="ValidationSummary2" runat="server" ValidationGroup="3" HeaderText="������ʾ"></asp:ValidationSummary>
+                                        </td>
+                                        </tr>
+                                   
+                                        </table>
+                                        <br />
+                                        <asp:Panel ID="panelApprovelist" runat="server" Width="100%" Visible="false">
+                                            <div style="width: 98%;" align="left">
+                                                <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                                                    <asp:Repeater ID="RepeaterApproveList" runat="server">
+                                                        <ItemTemplate>
+                                                               <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    <td>ϵ��</td>
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"PA_SCORE") %>
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="4"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="5" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                        </ItemTemplate>
+                                                    </asp:Repeater>
+                                                </table>
+                                            </div></asp:Panel>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Project/ProjectMain.aspx.cs b/Project/ProjectMain.aspx.cs
new file mode 100644
index 0000000..a673f65
--- /dev/null
+++ b/Project/ProjectMain.aspx.cs
@@ -0,0 +1,1000 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using view.App_Code;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectMain :  PageBase
+    {
+        private LProject _logic;
+
+  
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+
+            Validbtncontrols(rdblstMonth.SelectedValue=="0");
+            CurrentMonthSubmit();
+
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// ֻ�����ύ��ǰ���µ���Ŀ
+    /// </summary>
+    void CurrentMonthSubmit()
+    {
+        this.btnpdToApprove.Visible = Convert.ToInt32(this.btnYear.Text) == DateTime.Today.Year && rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected;
+        btnpd2approve.Visible = btnpdToApprove.Visible;
+    }
+
+    void Validbtncontrols(bool visible)
+    {
+        btn_addNew.Visible = visible;
+        btnPrjToApprove.Visible = visible;
+        btnDelete.Visible = visible;
+
+
+    }
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        { 
+            GridView1.DataSource = _logic.GetAllProjectDetail(lem.GetEmployee.ID,btnYear.Text, rdblstMonth.SelectedValue).DefaultView;  
+            GridView1.DataBind();
+            UpdateSession();
+           
+           // ProjectDataBind();
+         //   ProjectDetailDataBind();
+            //    btnSubmit.Enabled = false;
+           ClearProjDetailData();
+           ClearProjData();
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+         
+        void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+          //  this.TxtBtnYear.Text = btnYear.Text;
+
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "ID";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+                //           _logic = (LEmployee)Session[appScope.PagelevelObj];
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+//        Session[appScope.PagelevelObj] = _logic;
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+     //       txtProjMem4delete.Visible = (_logic.GetProject.pj_status == ProjectStatus.����δ�ύ) && rdblstMonth.Items[0].Selected;  //ֻ��ɾ���Լ������ġ�
+            txtProjMem4delete.Visible = rdblstMonth.Items[0].Selected;  // ����ɾ���κ���Ŀ״̬
+            lbprjmem4Delete.Visible = txtProjMem4delete.Visible;
+            btnDelete.Visible = txtProjMem4delete.Visible;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            txtProjMaster.Text = lem.GetEmployee.em_name;
+           txtProjPercent.Text = _logic.GetProject.pj_percent.ToString() ;
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+
+            ApproveListBind(_logic.GetProject.ID);
+
+           // btnDelete.Visible = true;
+        }
+    void ApproveListBind(int id)
+    {
+        RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+        RepeaterApproveList.DataBind();
+        panelApprovelist.Visible = true;
+    }
+        /// <summary>
+        /// ҳ�����Ŀ������Ϣ������Ϣ�ش�����Ŀʵ��
+        ///  
+        /// </summary>
+        void SetProjectDataBack()
+        {
+
+            //if (_logic.GetProject.ID > 0)
+            //{
+            //    _logic.GetProject.lastmodified = DateTime.Now.ToString();
+
+            //} 
+
+            //    ProjectDetail.Visible = true;
+            _logic.GetProject.pj_name  = txtProjectName.Text;
+            _logic.GetProject.pj_planStartDate =  drpdProjlisFromYear.SelectedValue +"-" + drplstProjFromMonth.SelectedValue +"-01"; 
+            _logic.GetProject.pj_planEndDate = drplstProjectToYear.SelectedValue +"-" + drlstProjToMonth.SelectedValue +"-01";
+            _logic.GetProject.pj_master = lem.GetEmployee.ID;
+            _logic.GetProject.pj_mem =txtPrjDesc.Text;
+            //   _logic.GetProject.pj_progress  =   Convert.ToInt32(txtProjProgress.Text)  ;  //��Ŀ����
+            if (txtProjPercent.Text != string.Empty) _logic.GetProject.pj_percent = Convert.ToInt32(txtProjPercent.Text) ;               //��ĿȨ��
+            _logic.GetProject.pj_type = drplstProjType.SelectedValue;
+            _logic.GetProject.pj_status = _logic.GetProject.pj_status == String.Empty ? ProjectStatus.����δ�ύ : _logic.GetProject.pj_status;
+            _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+            _logic.GetProject.pj_dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            if (_logic.GetProject.pj_nextDept == 0)
+                _logic.GetProject.pj_nextDept = -1;
+            else
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_nextDept;
+
+            /*  
+             * _logic.GetProject.pj_nextDept = _logic.GetProject.pj_nextDept == 0 ? -1 ; _logic.GetProject.pj_nextDept;
+          
+            * _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment( _logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if(dep.GetDepartment.dep_mastdept==0) //û���ϼ�����
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                }
+            }
+             * */
+            
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+            btnSubmit.Visible = true;
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+           
+            ApproveListBind(_logic.GetProjectDetail.ID);
+             
+        }
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+            btnSubmit.Visible = false;
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            panelApprovelist.Visible = false;
+        }
+
+
+        private void SetProjectDetailBack()
+        {
+            //if (_logic.GetProjectDetail.ID > 0)
+            //{
+            //    _logic.GetProjectDetail.lastmodified = DateTime.Now.ToString();
+
+            //} 
+ 
+            _logic.GetProject.pj_progress = Convert.ToInt32(txtPrjProgress.Text) ;
+            _logic.GetProject.pj_finishDate =txtPdActualEndDate.Text  ;
+            _logic.GetProjectDetail.pd_planTarget =txtPdPlanTarget.Text  ;
+            _logic.GetProjectDetail.pd_finishedTarget = txtPdFinishTarget.Text  ;
+            _logic.GetProjectDetail.pd_percent =Convert.ToInt32(txtPdPercent.Text)  ;
+            _logic.GetProjectDetail.pd_mem =txtPdMem.Text ;
+            //����ʱstatusĬ��Ϊ��δ�ύ��
+
+        }
+
+        /************************************** protected methods (event listeners) ********************************/
+
+        protected void btnAddnew_Click(object sender, EventArgs e)
+        {
+            chgOperTxt(true);
+            _logic.Initialize();
+            ClearProjData();
+            ProjectDetail.Visible = true;
+            btnSaveNewProj.Enabled = true;
+            validProjControles();
+            ProjectMonthDetail.Visible = false;
+
+            
+        }
+
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+        /// <summary>
+        /// ������Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnProjSubmit_Click(object sender, EventArgs e)
+        {
+
+            if(_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+
+            //�����Ŀ״̬��û�б仯���仯���������档
+           if(_logic.GetProject.pj_status.Equals(ProjectStatus.�������ύ)||_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ύ))
+           {
+                LProject lp = new LProject();
+                lp.GetProject.ID =_logic.GetProject.ID;
+                lp.GetProject.getModel();
+                if(!lp.GetProject.pj_status.Equals(_logic.GetProject.pj_status))
+                {
+                 //   Response.Write("<script>alert('��Ŀ  " +_logic.GetProject.pj_name +   "�Ѿ�������������ʧ�ܡ�')</script>");
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "�Ѿ�������������ʧ�ܡ�');", true);
+                    ProjectDataBind();
+                    return;
+                }
+            }
+            SetProjectDataBack();
+            if (_logic.GetProject.pj_name == string.Empty || _logic.GetProject.pj_name.Trim().Length == 0) return;
+            if (_logic.GetProject.pj_percent==0) return;
+            if (_logic.GetProject.ID > 0) _logic.UpdateProject(); else _logic.AddProject();
+            ClearProjData();
+            Databound();
+        
+        }
+
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+        {
+            /*
+            CheckBox chk;
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+                chk = new CheckBox();
+                chk.ID = e.Row.Cells[0].Text.Trim();
+                string pdstatus = e.Row.Cells[13].Text.Trim();
+                chk.Enabled = (pdstatus == ProjectDetailStatus.�¶�δ�ύ || pdstatus == ProjectDetailStatus.����δͨ�� ||
+                               pdstatus == ProjectDetailStatus.���δͨ�� || pdstatus == ProjectDetailStatus.Ԥ��δͨ��);
+                e.Row.Cells[1].Controls.Add(chk);
+            }
+            */
+        }
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+        //reset the page
+        protected void btnReset_Click(object sender, EventArgs e)
+        {
+            _logic.Initialize();
+            Page_Load(this, e);
+        }
+
+
+        /// <summary>
+        /// delete the project and details
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if(txtProjMem4delete.Text ==null ) return;
+            
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) || _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���))
+            {
+                 
+                 ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + " ��Ŀ�Ѿ���ɣ�������ɾ����');", true);
+                return;
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if ( (dep.GetDepartment.dep_manager != lem.GetEmployee.ID) &&(dep.GetDepartment.dep_mastdept != 0))
+                    {  
+                        return;
+                    }
+                }
+
+
+                if (!_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) ) 
+                {
+                    _logic.GetProject.pj_mem4del = txtProjMem4delete.Text;
+                    _logic.GetProject.pj_status = DeiNiu.Utils.ProjectStatus.ɾ��δ�ύ;
+
+                    _logic.GetProject.Update();
+                }
+                else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+                {
+
+                    _logic.Delete();
+
+                } 
+           
+ 
+
+            ClearProjData();
+            Databound();
+        }
+
+        /***************************************** internal methods ********************************************/
+ 
+
+        private void chgOperTxt(bool addNew)
+        {
+         
+          
+            btnSubmit.Enabled = true;
+        }
+
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+            btnSaveNewProj.Enabled = false;
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+            panelApprovelist.Visible = false;
+            
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+           // btnSaveNewProj.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+           // btnDelete.Enabled = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || _logic.GetProject.pj_status.EndsWith("δͨ��");
+            validProjControles();
+            btnSubmit.Visible = false;
+      
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            chgOperTxt(false);
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            validPdControles();
+        }
+    void validProjControles()
+    {
+        bool canEditSubmit;
+        canEditSubmit = _logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) || !_logic.GetProject.pj_status.EndsWith("�ѷ���") && !_logic.GetProject.pj_status.EndsWith("��ͨ��") && !_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)
+                                  &&!_logic.GetProject.pj_status.EndsWith("��ͨ��")||
+                                 _logic.GetProject.pj_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.Equals(string.Empty);
+        txtProjectName.ReadOnly = !canEditSubmit;
+       // drpdProjlisFromYear.Enabled = divEditProject.Visible;
+       //drplstProjFromMonth.Enabled = divEditProject.Visible;
+       // drplstProjectToYear.Enabled = divEditProject.Visible;
+       // drlstProjToMonth.Enabled = divEditProject.Visible;
+        drplstProjType.Enabled = canEditSubmit;
+        txtPrjDesc.ReadOnly = !canEditSubmit;
+      //  txtProjProgress.ReadOnly = !divEditProject.Visible; //��Ŀ����
+        txtProjPercent.ReadOnly = !canEditSubmit; //��ĿȨ��
+        SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+       // txtProjMem4delete.ReadOnly = !canEditSubmit; //����δ�ύ;
+        //  lbprjmem4Delete.Visible = divEditProject.Visible;
+        drplstProjDept.Enabled = canEditSubmit;
+
+        bool canNotDel = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) ||
+                         _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                         _logic.GetProject.pj_status == String.Empty || 
+                         _logic.GetProject.pj_status.StartsWith("ɾ��") ||
+                         _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��);
+
+        bool canDel = !canNotDel;
+        canDel = canDel && this.rdblstMonth.Items[0].Selected;
+         txtProjMem4delete.Visible = canDel;
+         lbprjmem4Delete.Visible = canDel;
+       //  if (btnDelete.Visible)
+         btnDelete.Visible = canDel;
+
+       
+    }
+    void validPdControles()
+    {
+        //--monthly detail.
+        projMonthDetailEdit.Visible = _logic.GetProjectDetail.pd_status.Equals(ProjectDetailStatus.�¶�δ�ύ) ||
+                                      !_logic.GetProjectDetail.pd_status.EndsWith("��ͨ��") &&
+                                      !_logic.GetProjectDetail.pd_status.EndsWith("��ͨ��") ||
+                                      _logic.GetProjectDetail.pd_status.Equals(string.Empty);
+ 
+
+
+        projMonthDetailEdit.Visible = projMonthDetailEdit.Visible &&
+                                      !(_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                        _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) &&
+                                         !_logic.GetProject.pj_status.EndsWith("δͨ��")) ||
+                                        _logic.GetProject.pj_status.StartsWith("����") &&
+                                        (!_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)) ||
+                                        _logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") ||
+                                        _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") ||
+                                        _logic.GetProject.pj_status.StartsWith("ɾ��"));
+
+        projMonthDetailEdit.Visible = projMonthDetailEdit.Visible ||
+                                      _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ�ѷ���);
+        txtPdName.ReadOnly = !projMonthDetailEdit.Visible;
+     //   txtPdStartDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPdEndDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPrjProgress.ReadOnly = !  projMonthDetailEdit.Visible ;
+     //   txtPdActualEndDate.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdPlanTarget.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdFinishTarget.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdPercent.ReadOnly = !  projMonthDetailEdit.Visible ;
+        txtPdMem.ReadOnly = !  projMonthDetailEdit.Visible ;
+
+        //--��˰�ť
+      
+
+    }
+
+
+        /// <summary>
+        /// project detail 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+            
+            SetProjectDetailBack();
+          
+            _logic.GetProjectDetail.Update();
+            ClearProjDetailData();
+            Databound();
+        }
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnToApprove_Click(object sender, EventArgs e)
+        {
+       //       _logic.GetProject.ID = Convert.ToInt32(GridView1.Rows[1].Cells[0].Text.Trim());
+
+
+            foreach (GridViewRow row in this.GridView1.Rows)
+            {
+                HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+                if (!checkNews.Checked) continue;
+                _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+                if(  _logic.GetProject.pj_status.EndsWith("δ�ύ")||  _logic.GetProject.pj_status.EndsWith("δͨ��") )
+                {
+                    _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                    //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                    LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                    if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                    {
+                        _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                        if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                            _logic.GetProject.Update();
+                            continue; //�����쵼��������
+                        }
+                    }
+                    //����������ύ�������쵼��׼
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                    _logic.GetProject.Update();
+                }
+            }
+             
+            Databound();
+
+
+        }
+
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>";
+    }
+
+   /// <summary>
+   /// �¶��ύ
+   /// </summary>
+   /// <param name="sender"></param>
+   /// <param name="e"></param>
+    protected void btnpdToApprove_Click(object sender, EventArgs e)
+    {
+
+        foreach (GridViewRow row in this.GridView1.Rows)
+        {
+            HtmlInputCheckBox checkNews = (HtmlInputCheckBox)row.FindControl("checkNews");
+            if (!checkNews.Checked) continue;
+            _logic.Initialize(Convert.ToInt32(GridView1.DataKeys[row.RowIndex].Value.ToString()));
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) continue; //�������Ŀ�������ύ��
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) continue;
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.����Ԥ��ͨ��)) continue;
+            if (_logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) continue;
+            if (_logic.GetProject.pj_status.StartsWith("����") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) continue;
+
+            if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.StartsWith("ɾ��"))
+            {
+                _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+                //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+                LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+                if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+                {
+                    _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                    if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+                    {
+                        if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+                        }
+
+                        if (_logic.GetProject.pj_status.StartsWith("����"))
+                        {
+                            _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                        }
+                        _logic.GetProject.Update();
+                         
+                    }
+
+                    else
+                    {
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+
+                        _logic.GetProjectDetail.Update();
+                        
+                        _logic.GetProject.Update();
+                    }
+
+                    if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                        {
+                            if (_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ))
+                                _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��; 
+                            else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ))
+                                _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                            else
+                            _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��; 
+                            _logic.GetProject.Update();
+                            _logic.GetProjectDetail.Update();
+                            continue;  //�����쵼��������
+                        }
+                    continue;
+                }
+                //����������ύ�������쵼��׼
+
+                  if (_logic.GetProject.pj_status.EndsWith("δ�ύ")||_logic.GetProject.pj_status.EndsWith("δͨ��"))
+                  {
+                      if(_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                      {
+                          _logic.GetProject.pj_status = ProjectStatus.ɾ�����ύ;
+                      }
+
+                      if (_logic.GetProject.pj_status.StartsWith("����"))
+                      {
+                          _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                      }
+                  } 
+                else
+                {
+                  _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                  _logic.GetProjectDetail.Update();
+                }
+                _logic.GetProject.Update();
+            }
+        }
+
+        Databound();
+
+    }
+    protected void btnpd2approve_Click(object sender, EventArgs e)
+    {
+        btnSubmit_Click( sender, e);
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return;
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return; 
+        if (_logic.GetProject.pj_status.StartsWith("ɾ��") && (!_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ) && !_logic.GetProject.pj_status.EndsWith("δͨ��"))) return;
+        if (_logic.GetProject.pj_status.StartsWith("����") && ( !_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))) return;
+
+
+        if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��") || _logic.GetProject.pj_status.StartsWith("ɾ��"))
+        {
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    {
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+                    }
+
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                    {
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                    }
+                    _logic.GetProject.Update();
+                }
+
+                else
+                {
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                    _logic.GetProjectDetail.Update();
+                    _logic.GetProject.Update();
+                }
+
+                if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                {
+                    if (_logic.GetProject.pj_status.Equals(ProjectStatus.ɾ��δ�ύ))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+                    else if (_logic.GetProject.pj_status.Equals(ProjectStatus.����δ�ύ))
+                        _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                    else
+                        _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+                    _logic.GetProject.Update();
+                    _logic.GetProjectDetail.Update();
+                    //�����쵼��������
+                }
+                Databound();
+                return;
+            }
+            //����������ύ�������쵼��׼
+
+            if (_logic.GetProject.pj_status.EndsWith("δ�ύ") || _logic.GetProject.pj_status.EndsWith("δͨ��"))
+            {
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ�����ύ;
+                }
+
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                {
+                    _logic.GetProject.pj_status = ProjectStatus.�������ύ;
+                }
+            } 
+            else
+            {
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+                _logic.GetProjectDetail.Update();
+            }
+            _logic.GetProject.Update();
+        }
+        Databound();
+    }
+    protected void btnpj2approve_Click(object sender, EventArgs e)
+    {
+
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����)) return; //�������Ŀ�������ύ��
+        if (_logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���)) return;
+
+        if (_logic.GetProjectDetail.pd_status.EndsWith("δ�ύ") || _logic.GetProjectDetail.pd_status.EndsWith("δͨ��"))
+        {
+            _logic.GetProject.pj_nextDept = _logic.GetProject.pj_dept;
+            //�����Ŀ�������DZ����ŵ����ܣ����ύ�ϼ�����
+            LDepartment dep = new LDepartment(_logic.GetProject.pj_dept);
+            if (dep.GetDepartment.dep_manager == lem.GetEmployee.ID)
+            {
+                _logic.GetProject.pj_nextDept = dep.GetDepartment.dep_mastdept;
+                if (dep.GetDepartment.dep_mastdept == 0) //û���ϼ�����
+                {
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+                    _logic.GetProject.Update();
+                    _logic.GetProjectDetail.Update();
+                    //�����쵼��������
+                }
+            }
+            //����������ύ�������쵼��׼
+            _logic.GetProject.Update();
+            _logic.GetProjectDetail.pd_status = ProjectDetailStatus.�¶����ύ;
+            _logic.GetProjectDetail.Update();
+        }
+        Databound();
+    }
+    protected void btnFileUpload_Click(object sender, EventArgs e)
+    {
+       ��
+        
+        Session["uploadCode"] =   new Random().Next();
+        string fileCode = Session["uploadCode"].ToString();
+        string fileType =  ((int)FileType.ProjectDetail).ToString();
+        string fileInfo = _logic.GetProjectDetail.ID.ToString();
+        string fileUPload = " window.showModalDialog('../upload/fileUpload.aspx?'+Math.random() +'=" + fileCode + "&fileType=" + fileType + "&fileInfo=" + fileInfo + "&id=" + lem.GetEmployee.ID + "'  )";
+        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", fileUPload, true);
+      �� ��
+      ��
+    ��
+    }
+   
+    protected void btnFileUploadReferesh_Click1(object sender, EventArgs e)
+    {
+
+        GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+        GVFiles.DataBind();
+
+    }
+    protected void GVFiles_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    { 
+        LFile fileObj = new LFile();
+        if (GVFiles != null)
+        {
+            if (GVFiles.DataKeys != null)
+            {
+                string id = GVFiles.DataKeys[e.RowIndex].Value.ToString();
+             
+                fileObj.Initialize(int.Parse(id));
+                fileObj.GetFilesmgr.Delete();
+                GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+                GVFiles.DataBind();
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        
+       
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName =  "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest ;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+   
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+      //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    protected void btnpj2approve_Click1(object sender, EventArgs e)
+    {
+
+    }
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+   
+    protected void Excel_Click(object sender, EventArgs e)
+    { 
+        Master.ScriptMgr.RegisterPostBackControl( Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[1].Visible = false;
+        GridView1.Columns[GridView1.Columns.Count -1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = true;
+        GridView1.Columns[1].Visible = true;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+
+ ��
+}
+ 
\ No newline at end of file
diff --git a/Project/ProjectsQuery.aspx b/Project/ProjectsQuery.aspx
new file mode 100644
index 0000000..0f8f3bb
--- /dev/null
+++ b/Project/ProjectsQuery.aspx
@@ -0,0 +1,224 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="ProjectsQuery.aspx.cs" Inherits="ProjectsQuery"   EnableEventValidation = "false"%>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%"  class="Table_Border" border=0>
+     <tr>
+            <td colspan="3">
+             <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+                 </td>
+        </tr>
+        <tr>
+        <td colspan="3" class ="ALine"></td>
+        </tr>
+        
+    <tr><td width="50" height="200" align="left"  valign="top">
+       <!--div   style= "width:200px;height:600px;overflow:scroll "--> 
+        <asp:TreeView ID="TreeDeptEmp" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="WMSȫ������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+      <!--/div-->
+    </td>
+    <td class="VLine"  ></td>
+    <td    align="left" valign="top" width="800"> <!------ THE DATA GRID AREA ------>
+       
+       <table width="100%">
+        <tr>
+                        <td > ��Ŀ���� </td>  
+           </tr>
+       <tr>
+       <td>
+       <asp:GridView id="GridView1" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid"  EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView1_PageIndexChanging"
+         �� OnSorting="GridView1_Sorting"
+         �� OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+         �� DataKeyNames="ID" 
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="ID" HeaderText="empid" Visible="false" >  </asp:BoundField>
+		                                                       ��
+				
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                
+                
+                 <asp:BoundField DataField="de_title" HeaderText="ְ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="de_title"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                
+				<asp:BoundField DataField="pd_period" HeaderText="ʱ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="pd_period"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				   
+				 
+              
+			 	 <asp:BoundField DataField="total_score" HeaderText="�ܵ÷�" SortExpression="total_score"    > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="��ϸ" ShowDeleteButton="FALSE"  ��
+				ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴��Ŀ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />
+                </asp:CommandField>
+			</columns>
+            <pagerstyle horizontalalign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+             </asp:GridView><asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"
+            Text="����Excel" />
+            
+       </td>
+       </tr>
+       
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+        <tr>
+                        <td > ��Ŀ��ϸ </td>  
+           </tr>
+        <tr>
+       <td>
+       
+            <div runat="Server" id="projectDetail" >
+         <asp:GridView id="GridView2" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid" DataKeyNames="pk_projDetail" EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView2_PageIndexChanging"
+             
+            
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                         
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"    > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				
+			</columns>
+            <emptydatatemplate> û������</emptydatatemplate>
+            <pagerstyle horizontalalign="Right" />
+        </asp:GridView>
+        <asp:Button id="Button2" runat="server" CssClass="Button" onclick="Excel_Click2"
+            Text="����Excel" />
+         </div>
+       
+       </td>
+       </tr>
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+       </table>
+         
+            </td>
+             </tr>
+          <tr>
+                        <td colspan="3" class="ALine" />    
+           </tr>
+            
+            <tr>
+                        <td colspan="3" align="left" valign="top">
+                              
+             
+      
+       </td></tr>
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Project/ProjectsQuery.aspx.bak b/Project/ProjectsQuery.aspx.bak
new file mode 100644
index 0000000..094fe02
--- /dev/null
+++ b/Project/ProjectsQuery.aspx.bak
@@ -0,0 +1,222 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="ProjectsQuery.aspx.cs" Inherits="ProjectsQuery"   EnableEventValidation = "false"%>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="100%"  class="Table_Border" border=0>
+     <tr>
+            <td colspan="3">
+             <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td   nowrap>
+                            
+                                <asp:TextBox id="btnYear"
+                                    runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged" Width="1px"></asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+                 </td>
+        </tr>
+        <tr>
+        <td colspan="3" class ="ALine"></td>
+        </tr>
+        
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDeptEmp" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDeptEmp_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="WMSȫ������" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td class="VLine"  ></td>
+    <td    align="left" valign="top" width="800"> <!------ THE DATA GRID AREA ------>
+       
+       <table width="100%">
+        <tr>
+                        <td > ��Ŀ���� </td>  
+           </tr>
+       <tr>
+       <td>
+       <asp:GridView id="GridView1" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid"  EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView1_PageIndexChanging"
+         �� OnSorting="GridView1_Sorting"
+         �� OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+         �� DataKeyNames="ID" 
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="ID" HeaderText="empid" Visible="false" >  </asp:BoundField>
+		                                                       ��
+				
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                
+                
+                 <asp:BoundField DataField="de_title" HeaderText="ְ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="de_title"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                
+				<asp:BoundField DataField="pd_period" HeaderText="ʱ��"  ItemStyle-HorizontalAlign ="Left" SortExpression="pd_period"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				   
+				 
+              
+			 	 <asp:BoundField DataField="total_score" HeaderText="�ܵ÷�" SortExpression="total_score"    > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="��ϸ" ShowDeleteButton="FALSE"  ��
+				ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴��Ŀ  &gt;">
+                    <HeaderStyle HorizontalAlign="Center"   />
+                    <ItemStyle HorizontalAlign="Center"   Wrap="False"  />
+                </asp:CommandField>
+			</columns>
+            <pagerstyle horizontalalign="Right" />
+            <emptydatatemplate> û������</emptydatatemplate>
+             </asp:GridView><asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"
+            Text="����Excel" />
+            
+       </td>
+       </tr>
+       
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+        <tr>
+                        <td > ��Ŀ��ϸ </td>  
+           </tr>
+        <tr>
+       <td>
+       
+            <div runat="Server" id="projectDetail" >
+         <asp:GridView id="GridView2" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+            CssClass="DataGrid" DataKeyNames="pk_projDetail" EmptyDataText="û�����ݡ�" OnPageIndexChanging="GridView2_PageIndexChanging"
+             
+            
+            PagerStyle-HorizontalAlign="Right" PageSize="10" ShowFooter="True" Width="99%">
+            <selectedrowstyle cssclass="SelectedItemStyle" />
+            <headerstyle cssclass="HeaderStyle" horizontalalign="Left" />
+            <rowstyle cssclass="ItemStyle" horizontalalign="left" />
+            <alternatingrowstyle cssclass="AlternatingItemStyle" />
+            <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                         
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				
+			</columns>
+            <emptydatatemplate> û������</emptydatatemplate>
+            <pagerstyle horizontalalign="Right" />
+        </asp:GridView>
+        <asp:Button id="Button2" runat="server" CssClass="Button" onclick="Excel_Click2"
+            Text="����Excel" />
+         </div>
+       
+       </td>
+       </tr>
+        <tr >
+       <td class="ALine">
+       
+       </td>
+       </tr>
+       </table>
+         
+            </td>
+             </tr>
+          <tr>
+                        <td colspan="3" class="ALine" />    
+           </tr>
+            
+            <tr>
+                        <td colspan="3" align="left" valign="top">
+                              
+             
+      
+       </td></tr>
+   
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Project/ProjectsQuery.aspx.cs b/Project/ProjectsQuery.aspx.cs
new file mode 100644
index 0000000..edea638
--- /dev/null
+++ b/Project/ProjectsQuery.aspx.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class ProjectsQuery : PageBase
+{
+    private LProject _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            _logic = new LProject();
+            bindDeptEmp();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        DataView dv2 = _logic.GetSumProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        if ( TreeDeptEmp.SelectedNode !=null && TreeDeptEmp.SelectedNode.Value!="0")
+        {
+          string  selectedValue = TreeDeptEmp.SelectedValue;
+            string wherecls = "ID= '" + selectedValue + "'";
+          if (TreeDeptEmp.SelectedNode.Text.StartsWith("."))
+          {
+              wherecls = "ID= '" + selectedValue + "'";
+          }
+          dv2.RowFilter = wherecls;
+       } 
+
+ 
+
+        GridView1.DataSource = dv2 ;
+        GridView1.DataBind();
+        if (GridView1.DataKeys != null && GridView1.DataKeys.Count>0 && GridView1.SelectedIndex!=-1)
+        { 
+            Databound( GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString());
+        }else
+
+        {
+            GridView2.DataSource = null;
+            GridView2.DataBind();
+        }
+            
+     
+       
+        UpdateSession();
+    // btnSubmit.Enabled = false;
+      //  ClearDetail();
+    }
+
+    private void Databound(string empId)
+    {
+       // if (empId == null) throw new ArgumentNullException("empId");
+        if (empId == null) return;
+
+        DataView dv = _logic.GetAllProjectDetail(Convert.ToInt32(empId),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+        GridView2.DataSource = dv;
+        GridView2.DataBind();
+        
+    }
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+       // TreeDeptEmp.Nodes.Clear();
+        BindEmpTree(TreeDeptEmp, "0", TreeDeptEmp.SelectedNode,lem.GetDepartments().DefaultView, lem.GetActivedEmpDept().DefaultView);
+
+
+
+    }
+
+
+
+    public void BindEmpTree(TreeView tree, string id, TreeNode pNode, DataView deptdv, DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<Strong>" + row["dep_name"] + "</Strong>";
+            node.Value = row["ID"].ToString(); 
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+            empdv.RowFilter = "de_dept=" + node.Value;
+            foreach (DataRowView emrow in empdv)
+            {
+                TreeNode tnEmp = new TreeNode(    "."+emrow["em_name"]   , emrow["ID"].ToString());
+                node.ChildNodes.Add(tnEmp);
+            }
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                tree.Nodes.Add(node);
+
+
+            }
+            else
+            {
+
+                pNode.ChildNodes.Add(node);
+
+            }
+            BindEmpTree(tree, node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+    void setTreeDeptEmpSelected(string toFind,TreeNode nd)
+    {
+        foreach (TreeNode cnd in nd.ChildNodes)
+        {
+            if (cnd.Value == toFind) 
+            {
+                cnd.Selected = true;
+                break;
+            }
+            else
+            {
+                setTreeDeptEmpSelected(toFind,cnd);
+            }
+
+        }
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LProject)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+ ��
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+  ��
+
+  ��
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView2_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView2.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+  ��
+  ��
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+     {
+        Databound();
+      ��
+    }
+
+
+ 
+    protected void TreeDeptEmp_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+
+        Databound();
+       
+    }
+    protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        Databound();
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+        //  btnYear.Text = TxtBtnYear.Text;
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+        trigger = new PostBackTrigger();
+        trigger.ControlID = Button2.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export1("application/ms-excel", "��Ŀ�����б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    protected void Excel_Click2(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView2.AllowPaging = false;
+        
+        Databound();
+        Export2("application/ms-excel", "��Ŀ��ϸ�б�.xls");
+        GridView2.AllowPaging = false;
+        
+        Databound();
+
+    }
+
+
+    private void Export1(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+    private void Export2(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView2.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
\ No newline at end of file
diff --git a/Project/WorkPlanMain.aspx b/Project/WorkPlanMain.aspx
new file mode 100644
index 0000000..a4a300a
--- /dev/null
+++ b/Project/WorkPlanMain.aspx
@@ -0,0 +1,116 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="WorkplanMain.aspx.cs" Inherits="WorkplanMain" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="40%" class="Table_NoBorder">
+<tr>
+
+<td align="center"   >
+ 
+
+    <asp:Calendar ID="Calendar1" runat="server" BackColor="White" BorderColor="White" BorderWidth="1px" FirstDayOfWeek="Monday" Font-Names="Verdana" Font-Size="19pt" 
+    ForeColor="#265AA3" Height="256px" NextPrevFormat="ShortMonth" OnSelectionChanged="Calendar1_SelectionChanged" ShowGridLines="True" Width="800px" Font-Bold="True" OnDayRender="Calendar1_DayRender">
+        <SelectedDayStyle BackColor="LightSteelBlue" ForeColor="Red" Font-Bold="True" Font-Names="����" Font-Size="XX-Large" />
+        <TodayDayStyle BackColor="#265AA3" ForeColor="White" />
+        <daystyle font-size="XX-Large" />
+        <OtherMonthDayStyle ForeColor="#999999" />
+        <NextPrevStyle Font-Bold="True" Font-Size="19pt" ForeColor="#333333" VerticalAlign="Bottom" />
+        <DayHeaderStyle Font-Bold="True" Font-Size="20pt" />
+        <TitleStyle BackColor="White" BorderColor="#265AA3" BorderWidth="4px" Font-Bold="True"
+            Font-Size="30pt" ForeColor="#265AA3" />
+    </asp:Calendar>
+ 
+    <br />
+
+</td>
+</tr>
+    
+    <tr><td style="width: 800px">
+    
+        <!------ THE DATA GRID AREA ------>
+     
+        <asp:gridview   id="GridView1"  CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        emptydatatext="û�����ݡ�" 
+
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging" 
+                        OnRowDataBound="GridView1_RowDataBound" 
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" AutoGenerateColumns="False">
+						 
+            <Columns>
+<asp:BoundField visible="false" DataField="ID" SortExpression="ID" HeaderText="workplanid"></asp:BoundField>
+<asp:BoundField visible="false" DataField="wpd_workplan" SortExpression="wpd_workplan" HeaderText="wpd_workplanid"></asp:BoundField>
+<asp:BoundField DataField="wpd_number" SortExpression="wpd_number" HeaderText="���"></asp:BoundField>
+<asp:BoundField DataField="wpd_content"   SortExpression="wpd_content" HeaderText="�ƻ�����"></asp:BoundField>
+<asp:BoundField DataField="wpd_mem"   SortExpression="wpd_mem" HeaderText="�ƻ�˵��"></asp:BoundField>
+<asp:CommandField SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;" ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ShowSelectButton="True" HeaderText="�ࡡ��">
+<HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+<ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+</asp:CommandField>
+</Columns>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<emptydatatemplate> û������</emptydatatemplate>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+            <PagerStyle HorizontalAlign="Right" />
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+            
+        </asp:gridview>
+        
+        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+       </td></tr>
+    <tr><td class="ALine" style="width: 667px"  >
+        </td></tr> 
+    <tr><td style="width: 667px">
+    
+    
+        <!------ THE ADD /DELETE AREA ------>
+      
+        <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+          <table class="Table_NoBorder" border="0" style="width: 755px; height: 122px">
+			<tr>
+			<td align="right" nowrap>
+               <asp:Label ID="Label2" runat="server" CssClass="Label"  Text="�ƻ�����"></asp:Label></td>
+               <td  >
+              
+					<asp:TextBox ID="txtPlanContent" runat="server"  CssClass="TextBox" MaxLength="100" Width="415px"  ></asp:TextBox>
+					</td>
+					  <td></td>
+			 </tr>
+			 <tr>
+			 <td  align="right" nowrap style="height: 44px">
+                <asp:Label ID="Label3" runat="server" CssClass="Label"  Text="�ƻ�˵��"></asp:Label></td><td style="height: 44px"  >
+                   <asp:TextBox ID="txtPlanMem" runat="server" CssClass="TextBox_Long" MaxLength="100" Width="710px" Height="119px" TextMode="MultiLine"  ></asp:TextBox>
+              </td>
+              <td></td>
+              </tr> 
+              <!------ BUTTONS ------>
+			    <tr>
+            <td   align="center" colspan="2">   <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+                
+                </td>
+            </tr>
+            
+            </table>
+            </asp:Panel>
+              
+         
+      
+      
+       
+      
+        </td></tr>
+        <tr><td style="width: 667px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Project/WorkPlanMain.aspx.cs b/Project/WorkPlanMain.aspx.cs
new file mode 100644
index 0000000..4f17cc5
--- /dev/null
+++ b/Project/WorkPlanMain.aspx.cs
@@ -0,0 +1,232 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class WorkplanMain : PageBase
+{
+    private LWorkplan _logic;
+   
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        lem = (LEmployee)Session["CurrentUser"]; 
+        if (!IsPostBack)
+        {
+            _logic = new LWorkplan();
+            Calendar1.SelectedDate = DateTime.Today ;
+             Databound();
+            
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+        _logic.CheckWorkplan(lem.GetEmployee.ID, Calendar1.SelectedDate.ToString(),true);  
+        GridView1.DataSource = _logic.GetLWorkplan.getWorkplanDetails(lem.GetEmployee.ID,Calendar1.SelectedDate.ToString());
+        GridView1.DataBind();
+        UpdateSession();
+     //   btnSubmit.Enabled = false;
+    //    ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LWorkplan)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtPlanContent.Text = _logic.GetLWorkplanDetail.wpd_content;
+        txtPlanMem.Text = _logic.GetLWorkplanDetail.wpd_mem;
+       
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        // _logic.Initialize();   _logic.CheckWorkplan ����ʼ�������ƻ�������
+        _logic.InitializeDetail();
+        UpdateSession();
+        DetailDataBind();
+        txtPlanContent.Focus();
+        GridView1.SelectedIndex = -1;
+       ��
+        Databound();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind(); 
+        txtPlanContent.Focus();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLWorkplanDetail.ID > 0 ? _logic.GetLWorkplanDetail.Update() : _logic.GetLWorkplanDetail.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+        /*
+        _logic.GetRole.dr = false;
+        _logic.GetRole.Update();
+        
+       */
+        _logic.GetLWorkplanDetail.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        
+    }
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+      
+        string sortExpression = e.SortExpression;
+        if (GridView1.SortDirection == SortDirection.Ascending)                      //����������
+        {
+             
+            SortGridView(sortExpression, " DESC");
+        }
+        else
+         {
+             
+            SortGridView(sortExpression, " ASC");
+        }
+    }
+ private void SortGridView(string sortExpression, string direction)
+   {
+       DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+       dv.Sort = sortExpression + direction;
+       GridView1.DataSource = dv;                       //��DataView�󶨵�GridView��
+       GridView1.DataBind();
+
+    } 
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+        ClearDetail();
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+        //if (_logic.GetLWorkplanDetail.ID > 0)
+        //    _logic.GetLWorkplanDetail.lastmodified = DateTime.Now.ToString();
+
+        _logic.GetLWorkplanDetail.wpd_content = txtPlanContent.Text;
+        _logic.GetLWorkplanDetail.wpd_mem = txtPlanMem.Text;
+        _logic.GetLWorkplanDetail.wpd_workplan = _logic.GetLWorkplan.ID;
+        _logic.GetLWorkplanDetail.wpd_number = _logic.getNexNumber(_logic.GetLWorkplan.ID);
+    }
+
+    private void chgOperTxt(bool addNew)
+    { 
+        btnSubmit.Enabled = true;
+         DataDetail.Visible = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtPlanMem.Text = "";
+        txtPlanContent.Text = "";
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+    protected void Calendar1_SelectionChanged(object sender, EventArgs e)
+    {
+        Databound();
+    }
+    protected void Calendar1_DayRender(object sender, DayRenderEventArgs e)
+    {
+      //  e.Cell.Controls.Add(new LiteralControl(" ������ "));
+     //   e.Cell.Font.Size = FontUnit.XXLarge;
+    }
+}
diff --git a/Project/WorkReport.aspx b/Project/WorkReport.aspx
new file mode 100644
index 0000000..7e210d5
--- /dev/null
+++ b/Project/WorkReport.aspx
@@ -0,0 +1,96 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="WorkReport.aspx.cs" Inherits="Project_WorkReport"  %>
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+    <table class="Table_Border" width="800px" border="0">
+        <tr>
+            <td>
+                <asp:Label ID="Label1" runat="server" CssClass="Label" Text="所属部门"></asp:Label></td>
+            <td>
+                <asp:DropDownList id="drplstProjDept" runat="server" CssClass="DropDownList">
+                </asp:DropDownList></td>
+            <td>
+                 </td>
+            <td style="width: 13px">
+                </td>
+        </tr>
+         <tr>
+            <td>
+                <asp:Label ID="Label11" runat="server" CssClass="Label" Text="上传类型"></asp:Label></td>
+            <td>
+                <asp:DropDownList id="drplstFileType" runat="server" CssClass="DropDownList">
+                </asp:DropDownList>
+                &nbsp;&nbsp;
+                <asp:Button ID="btnQuery" runat="server" CssClass="Button" Text="查询" OnClick="btnQuery_Click" /></td>
+            <td>
+               </td>
+            <td style="width: 13px">
+                 </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label5" runat="server" CssClass="Label" Text="上传工作总结"></asp:Label></td>
+            <td align="left">
+                <asp:FileUpload ID="fileUpload" runat="server" /></td>
+            <td>
+                &nbsp;</td>
+            <td style="width: 13px">
+                &nbsp;</td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label6" runat="server" CssClass="Label" Text="附件说明"></asp:Label></td>
+            <td align="left">
+                <asp:TextBox ID="txtFileDesc" runat="server" CssClass="TextBox" MaxLength="25">
+                </asp:TextBox>&nbsp;
+                <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="上传" OnClick="btnFileUpload_Click" ValidationGroup="1" />
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtFileDesc"
+                    ErrorMessage="*" ValidationGroup="1">＊</asp:RequiredFieldValidator>
+                <asp:Label id="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+            <td align="left">
+            </td>
+            <td style="width: 13px">
+                &nbsp;</td>
+        </tr>
+        <tr>
+            <td colspan="4" class="ALine">
+                <br />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <asp:Label ID="Label7" runat="server" CssClass="Label" Text="相关附件"></asp:Label>&nbsp;</td>
+            <td colspan="3" align="left">
+                &nbsp;
+                <asp:GridView id="GVFiles" runat="server" AllowPaging="True" AutoGenerateColumns="False"
+                    CssClass="DataGrid" DataKeyNames="ID" OnRowDeleting="GVFiles_RowDeleting"
+                    OnSelectedIndexChanged="GVFiles_SelectedIndexChanged" PagerStyle-HorizontalAlign="Right"
+                    ShowFooter="True" Width="70%">
+                    <columns>
+                                                                    <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID"
+                                                                        HeaderText="文件id" Visible="false"></asp:BoundField>
+                                                                     <asp:BoundField ReadOnly="True" DataField="em_name" SortExpression="emp_name"
+                                                                        HeaderText="上传人"   ></asp:BoundField>
+                                                                    <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="文件说明"></asp:BoundField>
+                                                                    <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="上传时间"
+                                                                        DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False"></asp:BoundField>
+                                                                    <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="可用"></asp:BoundField>
+                                                                    <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=查看  &gt;"
+                                                                        ShowDeleteButton="True" ShowHeader="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=删除 onclick='return delete_click()'&gt;"
+                                                                        ShowSelectButton="True" HeaderText="编　辑">
+                                                                        <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+                                                                        <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                                    </asp:CommandField>
+                                                                </columns>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+                    <emptydatatemplate>
+                                                                    没有数据</emptydatatemplate>
+                    <selectedrowstyle cssclass="SelectedItemStyle" />
+                    <pagerstyle horizontalalign="Right" />
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+                    <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                </asp:GridView></td>
+        </tr>
+    </table>
+</asp:Content>
+
diff --git a/Project/WorkReport.aspx.cs b/Project/WorkReport.aspx.cs
new file mode 100644
index 0000000..a08313e
--- /dev/null
+++ b/Project/WorkReport.aspx.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class Project_WorkReport :  PageBase
+{
+    private LFile _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        if(! IsPostBack)
+        {
+            InitializeControles();
+            _logic =new LFile();
+            Databound();
+        }
+
+        SessionSeting();
+       
+    }
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LFile)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    void Databound()
+    {
+        GVFiles.DataSource = _logic.GetFilesmgr.GetFilesByEmpFileType(lem.GetEmployee.ID,Convert.ToInt32(drplstFileType.SelectedValue));
+        GVFiles.DataBind();
+        UpdateSession();
+
+    }
+    void InitializeControles()
+    {
+        drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+        drplstProjDept.DataTextField = "DEP_NAME";
+        drplstProjDept.DataValueField = "ID";
+        drplstProjDept.DataBind();
+
+        ListItem li = new ListItem("半年度计划",((int)FileType.半年度计划).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("半年度总结", ((int)FileType.半年度总结).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("年度计划", ((int)FileType.年度计划).ToString());
+        drplstFileType.Items.Add(li);
+        li = new ListItem("年度总结", ((int)FileType.年度总结).ToString());
+        drplstFileType.Items.Add(li);
+    }
+
+    protected void btnFileUpload_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (drplstProjDept.Items.Count==0) return;
+            if (fileUpload.FileName.Length == 0) return;
+            lbuploadmessage.Text = "";
+            string fileName = fileUpload.FileName;
+
+            System.Random rand = new Random();
+            int len = rand.Next();
+            fileName = lem.GetEmployee.ID + "T" + drplstFileType.SelectedValue + len +
+                       fileName.Substring(fileName.LastIndexOf("."));
+            DirectoryInfo dir = new DirectoryInfo(Server.MapPath("~/upload/" + drplstFileType.SelectedValue));
+            if (!dir.Exists)
+                dir.Create();
+            string fileSavePath = Server.MapPath("~/upload/" + drplstFileType.SelectedValue + "/" + fileName);
+            fileUpload.SaveAs(fileSavePath);
+            lbuploadmessage.Text = "上传成功！";
+
+            LFile _logic = new LFile();
+            _logic.Initialize();
+            _logic.GetFilesmgr.File_type = Convert.ToInt32(drplstFileType.SelectedValue);
+            _logic.GetFilesmgr.file_dest = fileName;
+            _logic.GetFilesmgr.File_Desc = txtFileDesc.Text;
+            _logic.GetFilesmgr.File_Emp = Convert.ToInt32(lem.GetEmployee.ID);
+            _logic.GetFilesmgr.file_Dept = Convert.ToInt32(drplstProjDept.SelectedValue);
+            _logic.GetFilesmgr.Add();
+            Databound();
+
+        }
+        catch (Exception)
+        {
+
+            lbuploadmessage.Text = "上传失败！";
+        } 
+    }
+    protected void GVFiles_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles != null)
+        {
+            if (GVFiles.DataKeys != null)
+            {
+                string id = GVFiles.DataKeys[e.RowIndex].Value.ToString();
+
+                fileObj.Initialize(int.Parse(id));
+                if(fileObj.GetFilesmgr.File_Emp != lem.GetEmployee.ID)
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('不可以删除他人的文档。 ');", true);
+                    return;
+                }
+                fileObj.GetFilesmgr.Delete();
+                Databound();
+            }
+        }
+       
+
+    }
+    // 查看附件
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+
+    void page_init()
+    {
+        Master.ScriptMgr.EnablePartialRendering = false;
+    }
+ 
+    protected void  btnQuery_Click(object sender, EventArgs e)
+    {
+        if( drplstProjDept.Items.Count ==0) return;
+        DataView dv;
+        string dept = drplstProjDept.SelectedValue;
+        dv = _logic.GetFilesmgr.GetFilesByEmpFileType(lem.GetEmployee.ID, Convert.ToInt32(drplstFileType.SelectedValue)).DefaultView;
+        if(lem.GetCanApproveDeptList().Contains(dept))  
+        dv = _logic.GetFilesmgr.GetFilesByDeptFileType(  Convert.ToInt32(dept), Convert.ToInt32(drplstFileType.SelectedValue)).DefaultView;
+
+        GVFiles.DataSource = dv;
+        GVFiles.DataBind();
+         
+
+
+    }
+}
diff --git a/Project/复件 ProjectApprove.aspx.cspu b/Project/复件 ProjectApprove.aspx.cspu
new file mode 100644
index 0000000..d45b53b
--- /dev/null
+++ b/Project/复件 ProjectApprove.aspx.cspu	
@@ -0,0 +1,836 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Transactions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+
+
+public partial class ProjectApprove : PageBase
+    {
+        private LProject _logic;
+        private string authType = "";
+        protected void Page_Load(object sender, EventArgs e)
+        {
+          
+        
+            //   divPreApproveSubmit.Visible = authType.Equals("100"); //��ְ��¼
+            //    divApproveSubmit.Visible = authType.Equals("200");  //��ְ��¼
+            //   emId = Master.lem.GetEmployee.ID; masterpage has not been initialized yet
+         
+       ���� authType = Request.QueryString[0] ;
+            if (!IsPostBack)
+            {
+                if (lem == null) return ;
+                _logic = new LProject();
+                initializeControles();
+                Databound();
+            }
+            SessionSeting();
+            
+         
+        }
+ 
+        /*****************************************   private methods   ******************************************/
+
+
+
+
+        /// <summary>
+        /// bound the query list.
+        /// </summary>
+        private void Databound()
+        {
+            GridView1.DataSource = GetProjectListByRole();
+            GridView1.DataBind();
+            UpdateSession();
+            //    btnSubmit.Enabled = false;
+            ClearProjDetailData();
+            ClearProjData();
+            PanelApprove.Visible = false;
+        }
+        /// <summary>
+        /// ͨ���жϵ�ǰ�û������ݣ�ȷ�����ز�ͬ����Ŀ�б�
+        /// </summary>
+        /// <returns></returns>
+        DataView GetProjectListByRole()
+        {
+            if(authType.Equals("100")) //Ԥ�����
+            {
+                if (lem.CanShenHe || lem.CanYuShen)   //  ������ǰ�û����������Ŀ����Ȩ�� 
+                {
+                      return _logic.Get4ApproveList(lem.GetCanApproveDeptList(),btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                  
+                }
+               
+            }
+             
+              if (authType.Equals("200")) 
+            if (lem.CanKaoHe )   //  ����
+            {
+               DataView dv = _logic.GetProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+               dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "','" +ProjectStatus.ɾ�����ͨ��+ "') and pd_status not in ('"
+                   + ProjectDetailStatus.����ͨ�� + "','" +ProjectDetailStatus.����δͨ�� +"')"  + 
+                   "  or pd_status in('" + ProjectDetailStatus.���ͨ�� + "')";
+                return dv;
+
+            }
+        
+        if (authType.Equals("300"))
+            if (lem.CanKaoHe)   //  ������ʷ��¼
+            {
+                DataView dv = _logic.GetKaoHeHistoryProjectsByYearMonth(btnYear.Text, rdblstMonth.SelectedValue).DefaultView;
+                dv.RowFilter = "pj_status in('" + ProjectStatus.�������ͨ�� + "','" + ProjectStatus.��Ŀ��� + "')";
+                return dv;
+
+            }
+           
+            return new DataView();
+        }
+
+    void initializeControles()
+        {
+            btnYear.Text = DateTime.Today.Year.ToString();
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items.FindByValue(DateTime.Today.Month.ToString()).Selected = true;
+       
+            drpdProjlisFromYear.Items.Clear();
+            drplstProjectToYear.Items.Clear();
+       
+            for (int i = DateTime.Now.Year-10; i < DateTime.Now.Year + 10; i++)
+            {
+                ListItem li = new ListItem(i.ToString(),i.ToString());
+                drpdProjlisFromYear.Items.Add(li);
+                drplstProjectToYear.Items.Add(li); 
+            }
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+
+            drplstProjDept.DataSource = lem.GetEmployee.GetDepartments();
+            drplstProjDept.DataTextField = "DEP_NAME";
+            drplstProjDept.DataValueField = "ID";
+            drplstProjDept.DataBind();
+
+
+        }
+
+        private void SessionSeting()
+        {
+            if (IsPostBack)
+            {
+              
+                _logic = (LProject)Session[appScope.PagelevelObj];
+            }
+        }
+    
+        private void UpdateSession()
+        {
+  
+            Session[appScope.PagelevelObj] = _logic;
+        }
+
+        /// <summary>
+        /// �󶨵�ǰ��Ŀ��Ϣ��ҳ�����Ŀ������Ϣ��
+        /// </summary>
+        void ProjectDataBind()
+        {
+            ProjectDetail.Visible = true;
+            txtProjectName.Text = _logic.GetProject.pj_name;
+            SetDropDownlistSelection(drpdProjlisFromYear, Convert.ToDateTime(_logic.GetProject.pj_planStartDate) .Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, Convert.ToDateTime(_logic.GetProject.pj_planStartDate).Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, Convert.ToDateTime(_logic.GetProject.pj_planEndDate).Month.ToString());
+   
+            txtPrjDesc.Text = _logic.GetProject.pj_mem;
+            txtProjProgress.Text = _logic.GetProject.pj_progress.ToString();  //��Ŀ����
+            txtProjPercent.Text = _logic.GetProject.pj_percent.ToString();    //��ĿȨ��
+            SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            lbprjmem4Delete.Visible = _logic.GetProject.pj_status == DeiNiu.Utils.ProjectStatus.����δ�ύ;
+            txtProjMem4delete.Text = _logic.GetProject.pj_mem4del;
+            validControles();
+            ApproveListBind(_logic.GetProject.ID);
+            
+            SetDropDownlistSelection(drplstProjDept,   _logic.GetProject.pj_dept.ToString() );
+            divApproveScore.Visible = false;
+        }
+   
+       void ApproveListBind(int id)
+       {
+           RepeaterApproveList.DataSource = _logic.PaObj.GetApproveListByTastkId(id);
+           RepeaterApproveList.DataBind();
+           panelApprovelist.Visible = true;
+       }
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ProjectDetailDataBind()
+        {
+            ProjectMonthDetail.Visible = true;
+       
+            txtPdName.Text = _logic.GetProject.pj_name;
+            txtPdStartDate.Text = _logic.GetProject.pj_planStartDate;
+            txtPdEndDate.Text = _logic.GetProject.pj_planEndDate;
+            txtPrjProgress.Text = _logic.GetProject.pj_progress.ToString();
+            txtPdActualEndDate.Text = _logic.GetProject.pj_finishDate;
+            txtPdPlanTarget.Text = _logic.GetProjectDetail.pd_planTarget;
+            txtPdFinishTarget.Text = _logic.GetProjectDetail.pd_finishedTarget;
+            txtPdPercent.Text = _logic.GetProjectDetail.pd_percent.ToString();
+            txtPdMem.Text = _logic.GetProjectDetail.pd_mem;
+            ApproveListBind(_logic.GetProjectDetail.ID);
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+            validControles();
+            MonthlyScore();
+        }
+     void MonthlyScore()
+     {
+
+         divApproveScore.Visible = true;
+         txtSystemScore.Text = (Convert.ToDouble(_logic.GetProject.pj_percent*_logic.GetProjectDetail.pd_percent)/100).ToString();
+
+     }
+
+
+        /// <summary>
+        /// set data from shift object to page
+        /// </summary>
+        private void ClearProjDetailData()
+        {
+            ProjectMonthDetail.Visible = false;
+         
+            txtPdName.Text = "";
+            txtPdStartDate.Text = "";
+            txtPdEndDate.Text = "";
+            txtPrjProgress.Text = "";
+            txtPdActualEndDate.Text = "";
+            txtPdPlanTarget.Text ="";
+            txtPdFinishTarget.Text = "";
+            txtPdPercent.Text = "";
+            txtPdMem.Text ="";
+
+            //bind the files
+
+            GVFiles.DataSource = _logic.GetProjectDetail.GetFiles();
+            GVFiles.DataBind();
+
+        }
+
+
+        
+
+        /************************************** protected methods (event listeners) ********************************/
+
+     
+        protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+        {
+        }
+
+  
+       
+    
+        protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+        {
+            GridView1.PageIndex = e.NewPageIndex;
+            Databound();
+
+            //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+            //     GridView1.DataBind();    
+        }
+
+        protected void GridView1_DataBinding(object sender, EventArgs e)
+        {
+        }
+
+      
+
+        protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+        {
+        }
+
+
+       
+
+        /***************************************** internal methods ********************************************/
+ 
+
+     
+        private void ClearProjData()  
+        {
+            ProjectDetail.Visible = false;
+         
+            txtProjectName.Text = "";
+            SetDropDownlistSelection(drpdProjlisFromYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drplstProjFromMonth, DateTime.Now.Month.ToString());
+            SetDropDownlistSelection(drplstProjectToYear, DateTime.Now.Year.ToString());
+            SetDropDownlistSelection(drlstProjToMonth, DateTime.Now.Month.ToString());
+
+            txtProjMaster.Text = "";
+            txtPrjDesc.Text ="";
+            txtProjProgress.Text = "";  //��Ŀ����
+            txtProjPercent.Text = "";    //��ĿȨ��
+            // SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+            txtProjMem4delete.Visible =false;
+            lbprjmem4Delete.Visible =false;
+            txtProjMem4delete.Text = "";
+       
+        }
+
+
+     
+        protected void SetDropDownlistSelection(DropDownList drdlst,string value)
+        {
+            drdlst.Items[drdlst.SelectedIndex].Selected = false;
+            if (drdlst.Items.FindByValue(value)!=null)
+                drdlst.Items.FindByValue(value).Selected = true;
+        }
+
+
+        /// <summary>
+        /// edit project detail
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+        {
+            /*
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        ProjectDetailDataBind();
+    
+         */
+        }
+
+ ��
+        /// <summary>
+        /// ��ʾ��Ŀ������Ϣ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_EditProject(object sender, GridViewDeleteEventArgs e)
+        {
+        
+            if (GridView1 != null)
+            {
+                if (GridView1.DataKeys != null)
+                {
+                    string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                    _logic.Initialize(int.Parse(id));
+                }
+            }
+            GridView1.SelectedIndex = e.RowIndex;
+            Databound();
+            ProjectDataBind();
+            PanelApprove.Visible = true;
+        }
+
+
+        /// <summary>
+        /// ���ȱ༭/�ƻ�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+      
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+            Databound();
+            ProjectDetailDataBind();
+            PanelApprove.Visible = true;
+            divApproveProject.Visible = _logic.GetProject.pj_status == ProjectStatus.��������ͨ�� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ѷ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀδ��� ||
+                                         _logic.GetProject.pj_status == ProjectStatus.��Ŀ��� ||
+                                        _logic.GetProject.pj_status == ProjectStatus.��Ŀ�ⶳ;
+        }
+        void  validControles()
+        {
+                    txtProjectName.ReadOnly = true;
+                    drpdProjlisFromYear.Enabled = false ;
+                    drplstProjFromMonth.Enabled = false;
+                    drplstProjectToYear.Enabled = false;
+                    drlstProjToMonth.Enabled = false;
+                    drplstProjType.Enabled = false;
+                    txtPrjDesc.ReadOnly = true;
+                    txtProjProgress.ReadOnly = true; //��Ŀ����
+                    txtProjPercent.ReadOnly = true;   //��ĿȨ��
+                    SetDropDownlistSelection(drplstProjType, _logic.GetProject.pj_type);
+                    txtProjMem4delete.ReadOnly = true; //����δ�ύ;
+                    //  lbprjmem4Delete.Visible = false;
+                    drplstProjDept.Enabled = false;
+
+                    //--monthly detail.
+
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    txtPdName.ReadOnly = true;
+                    txtPdStartDate.ReadOnly = true;
+                    txtPdEndDate.ReadOnly = true;
+                    txtPrjProgress.ReadOnly = true;
+                    txtPdActualEndDate.ReadOnly = true;
+                    txtPdPlanTarget.ReadOnly = true;
+                    txtPdFinishTarget.ReadOnly = true;
+                    txtPdPercent.ReadOnly = true;
+                    txtPdMem.ReadOnly = true;
+                    //--��˰�ť
+                    btnApprove.Visible = true;
+                    btnReject.Visible = true;
+                 
+        }
+
+      
+        protected void rdblstMonth_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GridView1.SelectedIndex = -1;
+            Databound();
+        }
+        protected void btnYear_Click(object sender, EventArgs e)
+        {
+            rdblstMonth.SelectedItem.Selected = false;
+            rdblstMonth.Items[0].Selected = true;
+            Databound();
+
+
+
+        }
+
+        void bindProjectNote()
+        {
+        
+        }
+
+        protected void btnApprove_Click(object sender, EventArgs e)
+        {
+       
+           
+
+        }
+        protected void btnReject_Click(object sender, EventArgs e)
+        {
+
+            if (ProjectDetail.Visible)  //��Ŀ���
+            {
+                //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    {  ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name + 
+                          "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+                        return;
+                    }
+
+                }
+
+                if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��))
+                {
+                    if (authType.Equals("100")) //Ԥ�����
+                    
+                    { ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ���� ����ʧ��');", true);return;
+                    }
+                    if (authType.Equals("200"))  //���ˣ���������ٳ��֣���Ϊ��δ������Ŀ
+                    if (!lem.CanKaoHe) 
+                    {
+                        ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                            + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ��');", true); return;
+
+
+                    }
+
+                }
+
+
+
+                //������Ŀ״̬
+                if (lem.CanKaoHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.��������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                   
+                }
+
+                else if (lem.CanShenHe)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.�������δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ�����δͨ��;
+                }
+                else if (lem.CanYuShen)
+                {
+                    if (_logic.GetProject.pj_status.StartsWith("����"))
+                        _logic.GetProject.pj_status = ProjectStatus.����Ԥ��δͨ��;
+                    if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                        _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProject.ID;
+               
+               
+            }
+            else
+            {
+                //������Ŀ�¶���ϸ״̬
+                if (lem.CanKaoHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����δͨ��;
+                  
+                }
+
+                else if (lem.CanShenHe)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���δͨ��;
+
+                }
+                else if (lem.CanYuShen)
+                {
+
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��δͨ��;
+                }
+                _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+              
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀδ���;
+                    
+            }
+
+
+            using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    if (!ProjectDetail.Visible)
+                        _logic.GetProjectDetail.Update();
+                    //������Ŀ������һ����������
+
+                    //������Ŀ������һ����������
+                    _logic.GetProject.pj_nextDept = -1;
+                    _logic.GetProject.Update();
+                    //��¼���˶���
+
+                    _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+                    _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+                    _logic.PaObj.pa_isProj = !ProjectDetail.Visible;
+                    _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                    _logic.PaObj.pa_pass = false;
+                    _logic.PaObj.Add();
+
+                    trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣����Ŀ��������ʧ�ܡ�");
+                }
+
+
+            }
+
+          
+
+            ApproveListBind(_logic.GetProject.ID);
+            GridView1.SelectedIndex = -1;
+            Databound();//���°�����
+            txtApproveMem.Text = "";
+          //  ApproveListBind(_logic.GetProject.ID);
+          //  ProjectMonthDetail.Visible = false;
+          //  ProjectDetail.Visible = false;
+          //  PanelApprove.Visible = false;
+        }
+    protected void btnApprove_Click1(object sender, EventArgs e)
+    {
+       
+
+
+        LDepartment dept = new LDepartment(  );
+        dept.Initialize(_logic.GetProject.pj_nextDept);
+        
+        if (ProjectDetail.Visible)  //��Ŀ���
+        {
+             
+
+
+            //�ж���Ŀ�Ƿ��Ѿ������������ֹ�ڶ��¶�����ʱ����Ŀ�����
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ������ͨ��))
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ  " + _logic.GetProject.pj_name + "  �Ѿ�����ͨ��������Ҫ������������ʧ�ܡ�');", true);
+
+                return;
+
+            }
+
+            if (_logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��)|| _logic.GetProject.pj_status.Equals(ProjectStatus.ɾ�����ͨ��))
+            {
+                if (authType.Equals("100")) //Ԥ�����
+                
+                {ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                    + "  �Ѿ����ͨ�����������ٴ�����������ʧ�ܡ�');", true);
+                    return;
+                }
+
+                if (!lem.CanKaoHe) //����
+                {
+                    ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof (UpdatePanel), "alert",
+                                                        "alert('��Ŀ  " + _logic.GetProject.pj_name
+                                                        + "  �Ѿ����ͨ������Ҫ�п��˵�Ȩ�����ܽ��п��ˣ�����ʧ�ܡ�');", true);
+                    return;
+                }
+
+
+            }
+
+    //������Ŀ״̬
+            if (lem.CanKaoHe &&  authType.Equals("200")  )
+            {
+               if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.��������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ������ͨ��;
+                 _logic.GetProject.balanceThePercent();
+                _logic.GetProject.pj_nextDept = -1;
+            }
+
+            else if (lem.CanShenHe)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.�������ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                     _logic.GetProject.pj_status = ProjectStatus.ɾ�����ͨ��;
+              /*  {
+                    _logic.GetProject.pj_master = -1;
+                    _logic.GetProject.pj_dept = -1;
+                    _logic.GetProject.pj_status = ProjectStatus.��Ŀδ����;
+                }
+               */ 
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            else if (lem.CanYuShen)
+            {
+                if (_logic.GetProject.pj_status.StartsWith("����"))
+                    _logic.GetProject.pj_status = ProjectStatus.����Ԥ��ͨ��;
+                if (_logic.GetProject.pj_status.StartsWith("ɾ��"))
+                    _logic.GetProject.pj_status = ProjectStatus.ɾ��Ԥ��ͨ��;
+
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+            }
+            _logic.PaObj.pa_id = _logic.GetProject.ID;
+           
+        }
+        else
+        {
+         
+/*
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                              _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ���) || 
+                              _logic.GetProject.pj_status.StartsWith("ɾ��") || 
+                              _logic.GetProject.pj_status.StartsWith("����") &&
+                              (! _logic.GetProject.pj_status.Equals(ProjectStatus.�������ͨ��) ||
+         
+! _logic.GetProject.pj_status.Equals(ProjectStatus.��������ͨ��));
+  */
+            bool canNotApprove = _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀ����) ||
+                                 _logic.GetProject.pj_status.Equals(ProjectStatus.��Ŀδ����);
+                              
+               
+            if(canNotApprove )
+            {
+                ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", "alert('��Ŀ   " + _logic.GetProject.pj_name
+                     + "   �������¶�����������ʧ�ܡ�');", true);
+                return;
+            }
+   
+             
+         ��
+
+            //������Ŀ��ϸ״̬
+            if (lem.CanKaoHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.����ͨ��;
+                    _logic.GetProject.pj_nextDept = -1;
+                 _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+             //   _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                
+
+            }
+
+            else if (lem.CanShenHe)
+            {
+               
+                    _logic.GetProjectDetail.pd_status = ProjectDetailStatus.���ͨ��;
+
+                    _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept;
+             
+                _logic.GetProject.pj_status = ProjectStatus.��Ŀ���;
+              //  _logic.GetProject.pj_score = Convert.ToDecimal(txtSystemScore.Text);  //������Ŀ��
+                _logic.GetProject.pj_finishDate = DateTime.Now.ToShortDateString();
+                _logic.GetProject.pj_score = _logic.GetProjectDetail.pd_percent;
+
+               
+            }
+            else if (lem.CanYuShen)
+            {
+
+                _logic.GetProjectDetail.pd_status = ProjectDetailStatus.Ԥ��ͨ��;
+                _logic.GetProject.pj_nextDept = dept.GetDepartment.dep_mastdept; 
+            }
+
+            _logic.PaObj.pa_id = _logic.GetProjectDetail.ID;
+       //     _logic.PaObj.pa_score = txtApproveScore.Text.Length>0 ? Convert.ToInt32(txtApproveScore.Text) : Convert.ToInt32(txtSystemScore.Text);
+            _logic.PaObj.pa_score=Convert.ToDecimal(txtSystemScore.Text);
+            
+        }
+
+        using (TransactionScope trans = new TransactionScope())
+        {
+            try
+            {
+                if (!ProjectDetail.Visible)
+                    _logic.GetProjectDetail.Update();
+                //������Ŀ������һ����������
+
+                _logic.GetProject.Update();
+                //��¼���˶���
+                _logic.PaObj.pa_dept = _logic.GetProject.pj_dept;
+
+                _logic.PaObj.pa_emp = lem.GetEmployee.ID;
+
+                _logic.PaObj.pa_isProj = ProjectDetail.Visible;
+                _logic.PaObj.pa_mem = txtApproveMem.Text.Trim();
+                _logic.PaObj.pa_pass = true;
+                _logic.PaObj.Add();
+
+                trans.Complete();
+            }
+            catch (MyException)
+            {
+                throw;
+            }
+            catch (Exception)
+            {
+                throw new Exception("�����쳣����Ŀ����ʧ�ܡ�");
+            }
+
+
+        }
+      
+        ApproveListBind(_logic.GetProject.ID);
+        txtApproveMem.Text = "";
+        GridView1.SelectedIndex = -1;
+        Databound();//���°�����
+
+        //    ProjectMonthDetail.Visible = false;
+         //   ProjectDetail.Visible = false;
+        //    PanelApprove.Visible = false;
+    }
+
+    public string FormatShowContent(bool pass)
+    {
+        if (pass)
+            return "ͨ��" + "<img src=../Images/tick.png border=0 border=0 title= ����ͨ��>";
+        return "δͨ��" + "<img src=../Images/cross.png border=0 border=0 title= ����δͨ��>"; ;
+    }
+
+    protected void TxtBtnYear_TextChanged(object sender, EventArgs e)
+    {
+    
+        rdblstMonth.SelectedItem.Selected = false;
+        rdblstMonth.Items[0].Selected = true;
+        Databound();
+
+    }
+    // �鿴����
+    protected void GVFiles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        LFile fileObj = new LFile();
+        if (GVFiles.DataKeys != null)
+        {
+            string id = GVFiles.DataKeys[GVFiles.SelectedIndex].Value.ToString();
+
+            fileObj.Initialize(int.Parse(id));
+            string fileName = fileObj.GetFilesmgr.file_dest;
+            fileName = Server.UrlEncode("../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest);
+            fileName = "../upload/" + fileObj.GetFilesmgr.File_type + "/" + fileObj.GetFilesmgr.file_dest;
+            string openFile = "window.open('" + fileName + "');";
+            ScriptManager.RegisterStartupScript(Master.UpdatePanelMaster, typeof(UpdatePanel), "alert", openFile, true);
+        }
+    }
+
+
+    protected void Page_Init()
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+    }
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+        Master.ScriptMgr.RegisterPostBackControl(Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();
+        Export("application/ms-excel", "��Ŀ�б�.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();
+
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/Project/复件 ProjectApprove.aspxpu b/Project/复件 ProjectApprove.aspxpu
new file mode 100644
index 0000000..ea35f39
--- /dev/null
+++ b/Project/复件 ProjectApprove.aspxpu	
@@ -0,0 +1,445 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true"  EnableEventValidation = "true" 
+    CodeFile="ProjectApprove.aspx.cs" Inherits="ProjectApprove" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td colspan="4">
+                <table width="90%" class="Table_NoBorder">
+                    <tr>
+                        <td colspan="13" align="center">
+                            <cc1:NumericUpDownExtender ID="NumericUpDownExtender1" runat="server" Width="80"
+                                TargetControlID="btnYear">
+                            </cc1:NumericUpDownExtender>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td nowrap>
+                            <asp:TextBox id="btnYear" runat="server" AutoPostBack="True" OnTextChanged="TxtBtnYear_TextChanged"
+                                Width="1px">
+                            </asp:TextBox>
+                        </td>
+                        <td>
+                            <asp:RadioButtonList ID="rdblstMonth" runat="server" RepeatDirection="Horizontal"
+                                Width="709px" OnSelectedIndexChanged="rdblstMonth_SelectedIndexChanged" AutoPostBack="True">
+                                <asp:ListItem Value="0">ȫ��</asp:ListItem>
+                                <asp:ListItem Value="1" Selected="True">1��</asp:ListItem>
+                                <asp:ListItem Value="2">2��</asp:ListItem>
+                                <asp:ListItem Value="3">3��</asp:ListItem>
+                                <asp:ListItem Value="4">4��</asp:ListItem>
+                                <asp:ListItem Value="5">5��</asp:ListItem>
+                                <asp:ListItem Value="6">6��</asp:ListItem>
+                                <asp:ListItem Value="7">7��</asp:ListItem>
+                                <asp:ListItem Value="8">8��</asp:ListItem>
+                                <asp:ListItem Value="9">9��</asp:ListItem>
+                                <asp:ListItem Value="10">10��</asp:ListItem>
+                                <asp:ListItem Value="11">11��</asp:ListItem>
+                                <asp:ListItem Value="12">12��</asp:ListItem>
+                            </asp:RadioButtonList></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                <asp:GridView id="GridView1" runat="server" CssClass="DataGrid" Width="99%" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                    EmptyDataText="û�����ݡ�" ShowFooter="True" OnSorting="GridView1_Sorting" OnPageIndexChanging="GridView1_PageIndexChanging"
+                    AllowPaging="True" OnRowDeleting="GridView1_EditProject" DataKeyNames="pk_projDetail"
+                    AutoGenerateColumns="False" PagerStyle-HorizontalAlign="Right" PageSize="10">
+                    <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                    <headerstyle cssclass="HeaderStyle" horizontalalign="Left"></headerstyle>
+                    <rowstyle cssclass="ItemStyle" horizontalalign="left"></rowstyle>
+                    <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    <columns>
+				<asp:BoundField   DataField="pk_projDetail" HeaderText="pdid"  visible="false">  </asp:BoundField>
+		                                                        
+				<asp:BoundField DataField="PJ_NAME" HeaderText="��Ŀ����" SortExpression="PJ_NAME">
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="EM_NAME" HeaderText="������" SortExpression="EM_NAME"     >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField><asp:BoundField DataField="dep_name" HeaderText="����"  ItemStyle-HorizontalAlign ="Left" SortExpression="dep_name"  >
+                    <ItemStyle    Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="pd_month" HeaderText="�·�" SortExpression="pj_planStartDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle   Wrap="False" />
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				 
+				<asp:BoundField DataField="PJ_PERCENT" HeaderText="��ĿȨ��" SortExpression="PJ_PERCENT">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pd_percent" HeaderText="��Ŀ����" SortExpression="PJ_PROGRESS" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="pj_finishDate" HeaderText="ʵ�����ʱ��" SortExpression="pj_finishDate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                  
+			 <asp:BoundField DataField="pj_status" HeaderText="��Ŀ״̬" SortExpression="pj_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 	 <asp:BoundField DataField="pd_status" HeaderText="�¶�״̬" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			  <asp:BoundField DataField="pj_score" HeaderText="��Ŀ�÷�" SortExpression="pd_status"   > <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/></asp:BoundField>
+			 
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/detail.gif border=0  border=0 title= �鿴��Ŀ &gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=����  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%"  />
+                    <ItemStyle HorizontalAlign="Center" Width="10%"  />
+                </asp:CommandField>
+			</columns>
+                    <emptydatatemplate> û������</emptydatatemplate>
+                    <pagerstyle horizontalalign="Right" />
+                </asp:GridView>
+                
+                <asp:Button id="Button1" runat="server" CssClass="Button" onclick="Excel_Click"  Text="����Excel" />
+                    
+                    
+                     </td>
+        </tr>
+        <div runat="server" id="ProjectDetail" visible="false" align="left">
+        </div>
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label12" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>&nbsp;
+                </td>
+                <td align="left" colspan="3">
+                    <asp:TextBox ID="txtProjectName" runat="server" CssClass="TextBox_Long" MaxLength="50"
+                        Width="540px">
+                    </asp:TextBox>
+                    </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label13" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drpdProjlisFromYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drplstProjFromMonth" CssClass="DropDownList" runat="server"
+                        Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+                <td>
+                    <asp:Label ID="Label16" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjectToYear" CssClass="DropDownList" runat="server"
+                        Width="52px">
+                        <asp:ListItem Selected="True">2009</asp:ListItem>
+                        <asp:ListItem Value="2010">2010</asp:ListItem>
+                        <asp:ListItem>2011</asp:ListItem>
+                    </asp:DropDownList>
+                    ��
+                    <asp:DropDownList ID="drlstProjToMonth" CssClass="DropDownList" runat="server" Width="32px">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem>2</asp:ListItem>
+                        <asp:ListItem>3</asp:ListItem>
+                        <asp:ListItem Value="4">4</asp:ListItem>
+                        <asp:ListItem>5</asp:ListItem>
+                        <asp:ListItem>6</asp:ListItem>
+                        <asp:ListItem>7</asp:ListItem>
+                        <asp:ListItem>8</asp:ListItem>
+                        <asp:ListItem>9</asp:ListItem>
+                        <asp:ListItem>10</asp:ListItem>
+                        <asp:ListItem>11</asp:ListItem>
+                        <asp:ListItem>12</asp:ListItem>
+                    </asp:DropDownList>��</td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label9" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjProgress" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">0</asp:TextBox>
+                    %&nbsp;
+                </td>
+                <td>
+                    <asp:Label ID="Label10" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="True">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label17" runat="server" CssClass="Label" Text="������"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjMaster" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                        ReadOnly="true">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label14" runat="server" CssClass="Label" Text="��������"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjDept" CssClass="DropDownList" runat="server">
+                    </asp:DropDownList></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbproperty" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:DropDownList ID="drplstProjType" CssClass="DropDownList" runat="server">
+                        <asp:ListItem>�ص���Ŀ</asp:ListItem>
+                        <asp:ListItem>һ����Ŀ</asp:ListItem>
+                        <asp:ListItem>��������</asp:ListItem>
+                    </asp:DropDownList></td>
+                <td>
+                    <asp:Label ID="Label15" runat="server" CssClass="Label" Text="��ĿȨ��"></asp:Label>
+                </td>
+                <td align="left">
+                    <asp:TextBox ID="txtProjPercent" runat="server" CssClass="TextBox" MaxLength="50"
+                        Width="26px">
+                    </asp:TextBox>
+                    %</td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="Label18" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtPrjDesc" runat="server" CssClass="TextBox" MaxLength="500" Height="68px"
+                        TextMode="MultiLine" Width="542px">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td style="height: 45px; width: 72px;">
+                    <asp:Label ID="lbprjmem4Delete" runat="server" CssClass="Label" Text="ɾ����Ŀ˵��" Visible="False">
+                    </asp:Label></td>
+                <td colspan="3" style="height: 45px" align="left">
+                    <asp:TextBox ID="txtProjMem4delete" runat="server" CssClass="TextBox" MaxLength="500"
+                        Height="68px" TextMode="MultiLine" Width="542px" Visible="false">
+                    </asp:TextBox>
+                </td>
+            </tr>
+        <div id="ProjectMonthDetail" runat="server" width="100%" visible="false" align="left">
+        </div>
+            <tr>
+                <td nowrap>
+                    <asp:Label ID="Label2" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdName" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+                <td>
+                    <asp:Label ID="Label21" runat="server" CssClass="Label" Text="��Ŀ����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPrjProgress" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label19" runat="server" CssClass="Label" Text="��ʼʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdStartDate" CssClass="TextBox_Show" runat="server" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label4" runat="server" CssClass="Label" Text="����ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ʵ�ʽ���ʱ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdActualEndDate" runat="server" CssClass="TextBox_Show" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label11" runat="server" CssClass="Label" Text="���¼ƻ�Ŀ��"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPlanTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+                <td>
+                    <asp:Label ID="Label20" runat="server" CssClass="Label" Text="����ʵ�����"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdFinishTarget" runat="server" CssClass="TextBox" MaxLength="25">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label3" runat="server" CssClass="Label" Text="��ɰٷֱ�"></asp:Label></td>
+                <td align="left">
+                    <asp:TextBox ID="txtPdPercent" runat="server">
+                    </asp:TextBox>
+                </td>
+                <td align="left" colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="lbpdMem" runat="server" CssClass="Label" Text="ִ�����˵��"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtPdMem" runat="server" CssClass="TextBox" Height="159px" MaxLength="500"
+                        TextMode="MultiLine" Width="557px">
+                    </asp:TextBox></td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label7" runat="server" CssClass="Label" Text="��ظ���"></asp:Label>&nbsp;</td>
+                <td colspan="3" align="left">
+                    <asp:GridView id="GVFiles" CssClass="DataGrid" PagerStyle-HorizontalAlign="Right"
+                        runat="server" DataKeyNames="ID" AllowPaging="True" OnSelectedIndexChanged="GridView1_SelectedIndexChanged"
+                        Width="70%" ShowFooter="True" AutoGenerateColumns="False" PageSize="5">
+                        <columns>
+                                                            <asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="�ļ�id" Visible="False"></asp:BoundField>
+                                                            <asp:BoundField DataField="File_Desc" SortExpression="File_Desc" HeaderText="�ļ�˵��"></asp:BoundField>
+                                                            <asp:BoundField DataField="create_time" SortExpression="create_time" HeaderText="�ϴ�ʱ��"></asp:BoundField>
+                                                            <asp:BoundField DataField="dr" Visible="False" SortExpression="dr" HeaderText="����"></asp:BoundField>
+                                                            <asp:CommandField SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;" ShowHeader="True" ShowSelectButton="True" HeaderText="�ࡡ��">
+                                                            <HeaderStyle Width="15%" HorizontalAlign="Center"></HeaderStyle>
+
+                                                            <ItemStyle Width="15%" HorizontalAlign="Center"></ItemStyle>
+                                                            </asp:CommandField>
+                                                            </columns>
+                        <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                        <emptydatatemplate> û������</emptydatatemplate>
+                        <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                        <pagerstyle horizontalalign="Right" />
+                        <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                        <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                    </asp:GridView></td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+        <div id="PanelApprove" runat="server" width="100%" visible="false" align="left">
+             </div>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td nowrap>
+                    ������¼</td>
+                <td colspan="3">
+                    <div id="panelApprovelist" runat="server" width="100%" visible="false">
+                        <table width="80%" class="Table_Border" border="0" cellpadding="2" cellspacing="2">
+                            <asp:Repeater id="RepeaterApproveList" runat="server">
+                                <itemtemplate>  
+                                                                                                     <tr class="HeaderStyle">
+                                                                                                    <td>�������</td>
+                                                                                                    <td>������</td>
+                                                                                                     
+                                                                                                    
+                                                                                                    <td>����ʱ��</td>
+                                                                                                  </tr> 
+                                                                                                  <tr>
+                                                                                                    <td><%# FormatShowContent((bool)DataBinder.Eval(Container.DataItem,"PA_PASS")) %></td>
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"EM_NAME") %></td>
+                                                                                                    
+                                                                                                   
+                                                                                                    <td><%# DataBinder.Eval(Container.DataItem,"CREATE_TIME") %></td>
+                                                                                                  </tr>
+                                                                                                 
+                                                                                                  <tr>
+                                                                                                    <td class="HeaderStyle">������ע</td>
+                                                                                                  <td colspan="3"><pre> <%# DataBinder.Eval(Container.DataItem,"PA_MEM") %></pre></td>
+                                                                                                  </tr> 
+                                                                                                   <tr>
+                                                                                                  <td colspan="4" class="ALine">
+                                                                                                  </td>
+                                                                                                  </tr>
+                                                                                        </itemtemplate>
+                            </asp:Repeater>
+                        </table>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Label ID="Label5" runat="server" CssClass="Label" Text="������ע"></asp:Label></td>
+                <td colspan="3" align="left">
+                    <asp:TextBox ID="txtApproveMem" runat="server" CssClass="TextBox" Height="159px"
+                        MaxLength="500" TextMode="MultiLine" Width="581px">
+                    </asp:TextBox>
+                    <asp:RequiredFieldValidator id="RequiredFieldValidator2" runat="server" ControlToValidate="txtApproveMem"
+                        ErrorMessage="�����������������" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+            </tr>
+            <div runat="server" id="divApproveScore" visible="false">
+            </div>
+                <tr>
+                    <td>
+                        <asp:Label ID="Label111" runat="server" CssClass="Label" Text="ϵͳ����"></asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtSystemScore" runat="server" CssClass="TextBox_Show" MaxLength="25"
+                            Width="50px">
+                        </asp:TextBox></td>
+                    <td>
+                        <asp:Label ID="Label201" runat="server" CssClass="Label" Text="��������" visible="false">
+                        </asp:Label></td>
+                    <td align="left">
+                        <asp:TextBox ID="txtApproveScore" runat="server" CssClass="TextBox" MaxLength="25"
+                            Width="54px" visible="false">
+                        </asp:TextBox></td>
+                </tr>
+            <tr>
+                <td colspan="4">
+                    <asp:ValidationSummary id="ValidationSummary1" runat="server" ValidationGroup="1"
+                        HeaderText="������ʾ">
+                    </asp:ValidationSummary>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" class="ALine">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" align="center">
+                  <div id="divApproveProject" runat="server" align="Center">
+                    <asp:Button ID="btnApprove" runat="server" CssClass="Button" Text="����ͨ��" OnClick="btnApprove_Click1" />
+                    <asp:Button ID="btnReject" runat="server" CssClass="Button" Text="��������" OnClick="btnReject_Click" />
+                  </div>
+                </td>
+            </tr>
+    </table>
+</asp:Content>
diff --git a/ShowError.aspx b/ShowError.aspx
new file mode 100644
index 0000000..809f1ca
--- /dev/null
+++ b/ShowError.aspx
@@ -0,0 +1,24 @@
+<%@ Page Language="C#" MasterPageFile="masterPage.master" AutoEventWireup="true" CodeFile="ShowError.aspx.cs" Inherits="ShowError"  %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+     <table width="80%" class="Table_Border" align="center">
+        <tr>
+            <td   >
+                 <asp:Label ID="lbTitle" runat="server" ForeColor="Red" Text="������"></asp:Label> 
+            </td>
+            
+            </tr>
+            <tr>
+            <td>
+            <br />
+             <asp:Label ID="lbErrtrace" runat="server" ForeColor="Red" Height="130px" ></asp:Label>
+            </td>
+            </tr>
+           </table>
+   
+   
+   
+ 
+   
+
+</asp:Content>
+
diff --git a/ShowError.aspx.cs b/ShowError.aspx.cs
new file mode 100644
index 0000000..e834156
--- /dev/null
+++ b/ShowError.aspx.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using System.Text;
+public partial class ShowError : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  //      StringBuilder strResponse =(StringBuilder) Session["ERROINFO"];
+    //    String strResponse =  Session["ERROINFO"].ToString();
+      //  Response.Write(strResponse);
+   //     lbErrtrace.Text = Session["ERROINFO"] == null ? "��û�е�¼����ǰ�Ự�ѹ��ڣ������µ�¼��" : Session["ERROINFO"].ToString();
+    
+        lbErrtrace.Text =Application["error"]!=null? Application["error"].ToString() : " ����ϵ����Ա��";
+        Application["error"] = null;
+
+    }
+}
diff --git a/ShowNews.aspx b/ShowNews.aspx
new file mode 100644
index 0000000..c4f6f54
--- /dev/null
+++ b/ShowNews.aspx
@@ -0,0 +1,42 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="ShowNews.aspx.cs" Inherits="ShowNews" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title> </title>
+     <link href="ZhangPuStyle.css" type="text/css" rel="stylesheet"/>
+</head>
+<body>
+ <script type="text/javascript" language="javascript">
+	<!-- #include file="public/JScript.js" -->
+    </script>
+    <form id="form1" runat="server">
+        
+        <div runat="server" id="news"> 
+            <br />
+        <table width="800" class="Table_Border" align="center">
+         <tr class="top_bg">
+        <td align="center"  > 
+         
+        <asp:Label ID="lbTitle" runat="server" Text=" 没有数据" Font-Bold="True"   Font-Size="Large" Height="25px" 　></asp:Label> </td>
+      </tr>
+      <tr>
+        <td>  
+            <asp:TextBox ID="txtContent" runat="server" CssClass="TextBox_Show_Long"  ReadOnly="true" BorderStyle="None" BorderColor="InactiveCaptionText" BackColor="WhiteSmoke" ForeColor="DarkSlateGray" TextMode="MultiLine" Height="550px" Width="800px"></asp:TextBox>
+        
+        </td>
+      </tr>
+      <tr>
+        <td align="center"> <br /><input type="button"   name="Button" value="关 闭" class="Button" onclick="window.close()" /><br /></td>
+      </tr>
+      
+    </table>
+
+
+        
+        
+        </div>
+        
+    </form>
+</body>
+</html>
diff --git a/ShowNews.aspx.cs b/ShowNews.aspx.cs
new file mode 100644
index 0000000..db71b92
--- /dev/null
+++ b/ShowNews.aspx.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Web.UI;
+using DeiNiu.wms.Logical;
+
+
+public partial class ShowNews : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        string newsID = Request.QueryString["newsID"]; 
+        LPublicNews logic = new LPublicNews();
+        try
+        {
+            logic.GetPublicNews.ID = Convert.ToInt32(newsID) ;
+             logic.GetPublicNews.getModel();
+             lbTitle.Text = logic.GetPublicNews.news_title   ; 
+            txtContent.Text =   logic.GetPublicNews.news_content;
+            this.Title = logic.GetPublicNews.news_title;
+        }
+        catch (Exception)
+        {
+            news.Visible = false;
+            Response.Write("û�ҵ���Ҫ����Ϣ");
+        }
+       
+      
+    }
+}
\ No newline at end of file
diff --git a/ShowNewsCate.aspx b/ShowNewsCate.aspx
new file mode 100644
index 0000000..5d5aac4
--- /dev/null
+++ b/ShowNewsCate.aspx
@@ -0,0 +1,72 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="ShowNewsCate.aspx.cs" Inherits="ShowNewsCate"  %>
+
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ 
+ <table width="95%" align="center">
+ 
+  <asp:Repeater id="RepeaterTop" runat="server" OnItemDataBound="RepeaterTop_ItemDataBound">   
+  
+     <itemtemplate> 
+       
+            <tr><td class="news_line"  ><strong> <%# DataBinder.Eval(Container.DataItem,"auth_name") %> </strong></td></tr>
+            <tr><td    >
+            <asp:Repeater id="RepeaterSecond" runat="server" OnItemDataBound="RepeaterSecond_ItemDataBound">   
+      
+             <itemtemplate>
+              
+             <div style="float:left; width:95%;"  class="news_table" align="left">
+			  <strong> <div style="margin:5px 0px;"> &nbsp;&nbsp;&nbsp;&nbsp;<%# DataBinder.Eval(Container.DataItem,"auth_name") %>&nbsp; &nbsp; </div></strong>
+                   
+                          <asp:Repeater id="RepeaterThird" runat="server"  >   
+ 
+                             <itemtemplate> 
+                                   <div style="float:left;  width:48%;" align="left"> 
+                                   
+                                  &nbsp;&nbsp;&nbsp;&nbsp; · <a href='ShowNews.aspx?NewsID=<%# DataBinder.Eval(Container.DataItem,"ID") %>' target="_blank"><%# FormatShowContent((string)DataBinder.Eval(Container.DataItem, "news_title"),25) %></a>&nbsp;<%# DataBinder.Eval(Container.DataItem, "create_time", "{0:MM/dd} ")%></div>  
+              
+                             </itemtemplate>
+
+
+                            </asp:repeater>  
+             
+               </div>   
+              
+               </itemtemplate>
+
+            </asp:repeater>  
+      
+         </td></tr>
+    </itemtemplate>
+</asp:repeater> 
+
+  <tr><td> &nbsp;&nbsp;</td></tr>
+  
+  <tr><td align="center">
+  
+ <marquee style="color:red;font-size:20px; " direction="up" height="18" scrollamount="1"   onMouseOver="this.scrollDelay=500"  onMouseOut="this.scrollDelay=1">
+ <asp:Repeater id="RepeaterMarquee" runat="server"  >    
+   <itemtemplate> 
+ <strong> &nbsp;&nbsp; <%# DataBinder.Eval(Container.DataItem,"news_title") %></strong><br />
+ 
+<%# DataBinder.Eval(Container.DataItem,"news_content") %>
+ 
+ <br /> 
+  </itemtemplate></asp:repeater></marquee>
+     
+     </td></tr>
+
+
+     <tr>
+     <td>
+     
+     
+           
+         &nbsp;</td>
+     
+     </tr>
+
+ </table>   
+ 
+</asp:Content>
+
diff --git a/ShowNewsCate.aspx.cs b/ShowNewsCate.aspx.cs
new file mode 100644
index 0000000..00d9a65
--- /dev/null
+++ b/ShowNewsCate.aspx.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class ShowNewsCate : Page
+{
+    private string cateId;
+    private string upId;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+        cateId = Request.QueryString["cateId"];
+        upId = Request.QueryString["upId"];
+        if (!IsPostBack)
+             bindData();
+    }
+
+    private void InitializeComponent()
+    {
+
+    }
+
+
+   void bindData()
+   {
+       LPublicNews logic = new LPublicNews();
+       DataView dv = logic.QueryTopCatagory().DefaultView;
+       dv.RowFilter = "ID='" + upId+"'";
+       RepeaterTop.DataSource = dv;
+       RepeaterTop.DataBind();
+
+       RepeaterMarquee.DataSource = logic.QueryMarqueen().DefaultView;
+       RepeaterMarquee.DataBind();
+        
+   }
+
+    protected void RepeaterTop_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterSecond");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+             LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryPublicInfomation().DefaultView;
+           // dv.RowFilter = "auth_uplevel='" + authID + "' and auth_marqueen=0 ";
+            dv.RowFilter = "ID='" + cateId + "'";
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+            
+        }
+    }
+
+    protected void RepeaterSecond_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterThird");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+            LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryNews(Convert.ToInt32(authID)).DefaultView;
+            dv =  GetTopDataViewRows(dv,10);
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+
+        }
+    }
+
+    public string FormatShowContent(string titlecontent, int titlelength)
+    {
+        if (titlecontent.Length > titlelength)
+        {
+            return titlecontent.Substring(0, titlelength);
+        }
+        else
+        {
+            for (int i = 0; i < titlelength - titlecontent.Length;i++ )
+                titlecontent += "&nbsp;";
+
+            return titlecontent;
+            
+        }
+        
+    }
+
+   private  DataView GetTopDataViewRows(DataView dv, int n)
+    {
+        DataTable dt = dv.Table.Clone();
+
+        for (int i = 0; i < n - 1; i++)
+        {
+            if (i >= dv.Count)
+            {
+                break;
+            }
+            dt.ImportRow(dv[i].Row);
+        }
+        return new DataView(dt, dv.RowFilter, dv.Sort, dv.RowStateFilter);
+    }
+   
+   
+}
diff --git a/Training/.svn/entries b/Training/.svn/entries
new file mode 100644
index 0000000..c9ff03b
--- /dev/null
+++ b/Training/.svn/entries
@@ -0,0 +1,300 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/Training
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+LessonCategory.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:02.086690Z
+868c83c734e86953183a262661b6dd2a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6660
+
+LessonEmp.aspx
+file
+
+
+
+
+2011-04-01T02:51:02.086690Z
+ed02ed38d52dfe5c6b38229faee3a881
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5322
+
+Lesson.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:02.102315Z
+22b853e52dd1c687385ae76b76e33835
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9623
+
+LessonEmp.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:02.258566Z
+c8d7092d7dba2250d948385775f55f60
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10742
+
+LessonView.aspx
+file
+
+
+
+
+2011-04-01T02:51:02.274192Z
+ea6c8f89000eb9cf2846ec6bb076fee6
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11441
+
+LessonCategory.aspx
+file
+
+
+
+
+2011-04-01T02:51:02.274192Z
+5c98a26aaad0784c3e0f5b223b709a7d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5566
+
+LessonView.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:02.289817Z
+0def9b1ad3489fe776bcd6dfd2d779b7
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9471
+
+Lesson.aspx
+file
+
+
+
+
+2011-04-01T02:51:02.289817Z
+495689bb176b9de34fa73bfc530a0c82
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14744
+
diff --git a/Training/.svn/text-base/Lesson.aspx.cs.svn-base b/Training/.svn/text-base/Lesson.aspx.cs.svn-base
new file mode 100644
index 0000000..55b2e7a
--- /dev/null
+++ b/Training/.svn/text-base/Lesson.aspx.cs.svn-base
@@ -0,0 +1,327 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class Lesson :PageBase
+{
+    private Llesson _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            _logic = new Llesson();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        //�󶨿γ̷��� 
+        DataView dvDept = new DataView(_logic.GetAllActivedCategories());
+         
+      
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+        //�󶨿γ̷�����ѡ�еĿγ̷����µ����пγ�����
+        DataView dv = TreeDept.SelectedValue != "0" ? new DataView(_logic.GetLessonsByCat(Convert.ToInt32(TreeDept.SelectedValue))) : new DataView(_logic.GetAllActiveData().Tables[0]);
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (Llesson)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLesson.le_name;
+        txtDesc.Text = _logic.GetLesson.le_desc;
+        txtLocation.Text = _logic.GetLesson.le_location;
+    //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = _logic.GetLesson.le_xuefen.ToString();
+        txtTrainer.Text = _logic.GetLesson.le_trainer;
+    //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = _logic.GetLesson.le_startdate;
+        txtEndDate.Text = _logic.GetLesson.le_enddate;
+      
+ 
+ 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+     //   DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLesson.ID > 0 ? _logic.GetLesson.Update() : _logic.GetLesson.Add();
+        ClearDetail();
+        Databound();
+        DataDetail.Visible = false;
+
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLesson.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+   
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+        if (_logic.GetLesson.ID > 0) 
+       {
+           _logic.GetLesson.last_modified = DateTime.Now.ToString(); 
+        
+       }
+       _logic.GetLesson.le_category = Convert.ToInt32(TreeDept.SelectedValue);
+
+      
+     _logic.GetLesson.le_name =  txtName.Text ;
+      _logic.GetLesson.le_desc  =txtDesc.Text ;
+      _logic.GetLesson.le_location  =txtLocation.Text ;
+       //    txtMaster.Text = _logic.GetLesson.le_master;
+   �� _logic.GetLesson.le_xuefen = Convert.ToInt32(txtXunFen.Text);
+    �� _logic.GetLesson.le_trainer = txtTrainer.Text;��
+      _logic.GetLesson.le_startdate  = txtStartDate.Text;
+      _logic.GetLesson.le_enddate =txtEndDate.Text  ;��
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+         
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+       
+        txtName.Text = "";
+        txtDesc.Text = "";
+        txtLocation.Text = "";
+        //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = "";
+        txtTrainer.Text = "";
+        //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = "";
+        txtEndDate.Text = "";
+      
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["pk_lessonCategory"].ToString();
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")
+             dv.RowFilter = "le_category = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        DataDetail.Visible = false;
+        
+    }
+   
+
+    
+ 
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+      
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count -1].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "��ѵ����.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = true;
+        Databound();  
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+
+   
+}
\ No newline at end of file
diff --git a/Training/.svn/text-base/Lesson.aspx.svn-base b/Training/.svn/text-base/Lesson.aspx.svn-base
new file mode 100644
index 0000000..4ff8ba6
--- /dev/null
+++ b/Training/.svn/text-base/Lesson.aspx.svn-base
@@ -0,0 +1,192 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" EnableEventValidation="false"
+    AutoEventWireup="true" CodeFile="Lesson.aspx.cs" Inherits="Lesson" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td width="50" height="200" align="left" valign="top">
+                            <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged"
+                                ImageSet="Arrows">
+                                <nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </nodes>
+                                <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                            </asp:TreeView>
+                        </td>
+                        <td width="1" class="VLine">
+                        </td>
+                        <td align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <table width="90%">
+                                <tr>
+                                    <td>
+                                        <asp:gridview id="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                            runat="server" AutoGenerateColumns="False" OnRowEditing="GridView1_RowEditing"
+                                            DataKeyNames="pk_lesson" OnRowDeleting="GridView1_RowDeleting" AllowPaging="True"
+                                            OnPageIndexChanging="GridView1_PageIndexChanging" OnSorting="GridView1_Sorting"
+                                            OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="99%" ShowFooter="True"
+                                            EmptyDataText='û�����ݡ�'>
+                                            <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                            <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                            <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                            <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                            <columns>
+				<asp:BoundField  Visible="False"  ReadOnly="True" DataField="pk_lesson" HeaderText="��Աid" SortExpression="pk_lesson" ></asp:BoundField>
+				<asp:BoundField DataField="le_name" HeaderText="�γ�" SortExpression="le_name">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_startdate" HeaderText="��ʼ����" SortExpression="le_startdate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                	<asp:BoundField DataField="le_enddate" HeaderText="��������" SortExpression="le_enddate" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_location" HeaderText="�ص�" SortExpression="le_location">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_xuefen" HeaderText="ѧ��" SortExpression="le_xuefen">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_trainer" HeaderText="��ʦ" SortExpression="le_trainer">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+			
+			
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</columns>
+                                            <pagerstyle horizontalalign="Right" />
+                                        </asp:gridview>
+                                        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+                                        <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+                                    </td>
+                                </tr>
+                               
+                                <tr>
+                                    <td align="center">
+                                        <!------ THE ADD /DELETE AREA ------>
+                                        <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                            <!------ THE ADD /DELETE AREA ------>
+                                            <table    align="left">
+                                             <tr>
+                                              <td class="ALine" nowrap colspan="6" >
+                                               </td>
+                                              </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text='�γ�'></asp:Label></td>
+                                                    <td nowrap align="left">
+                                                        <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                                                            ErrorMessage="�γ����Ʋ�����Ϊ��" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                        <td nowrap colspan="4">     </td>
+                                                     </tr>
+                                                     <tr>       
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbstartdate" runat="server" CssClass="Label" Text='��ʼ����'></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtStartDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <cc1:CalendarExtender ID="CalendarExtender1" CssClass="MyCalendar" runat="server"
+                                                            TargetControlID="txtStartDate" FirstDayOfWeek="Monday">
+                                                        </cc1:CalendarExtender>
+                                                    </td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbEndDate" runat="server" CssClass="Label" Text="��������" /></td>
+                                                    <td  >
+                                                        <asp:TextBox ID="txtEndDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <cc1:CalendarExtender ID="CalendarExtender4" CssClass="MyCalendar" runat="server"
+                                                            TargetControlID="txtEndDate" FirstDayOfWeek="Monday">
+                                                        </cc1:CalendarExtender>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td >
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ѧ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtXunFen" CssClass="TextBox" runat="server" MaxLength="25">0</asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtXunFen"
+                                                            ErrorMessage="������ѧ��" ValidationGroup="1">��</asp:RequiredFieldValidator>
+                                                        <asp:RegularExpressionValidator ID="RegularExpressionValidator1" runat="server" ControlToValidate="txtXunFen"
+                                                            ErrorMessage="ѧ��ӦΪ���ڵ����������" ValidationExpression="^[1-9]\d*|0$" ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="��ʦ"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtTrainer" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="������" visible="false"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtMaster" CssClass="TextBox" runat="server" MaxLength="25" visible="false">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="lblocation" runat="server" CssClass="Label" Text="�ص�" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtLocation" CssClass="TextBox" runat="server" MaxLength="300" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbDesc" runat="server" CssClass="Label" Text="�γ̽���" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtDesc" CssClass="TextBox" runat="server" MaxLength="500" Height="104px"
+                                                            TextMode="MultiLine" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="6" align="center">
+                                                        <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td align="left">
+                                                        <asp:ValidationSummary ID="ValidationSummary1" runat="server" HeaderText="������ʾ" ValidationGroup="1" />
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        </td>
+                                        </tr>
+                                  
+                                 
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Training/.svn/text-base/LessonCategory.aspx.cs.svn-base b/Training/.svn/text-base/LessonCategory.aspx.cs.svn-base
new file mode 100644
index 0000000..2137bee
--- /dev/null
+++ b/Training/.svn/text-base/LessonCategory.aspx.cs.svn-base
@@ -0,0 +1,235 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class LessonCategory :PageBase
+{
+    private LlessonCat _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LlessonCat();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+        
+     
+        //װ��ѡ�����Žڵ�IJ�������
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dv);
+        //�����б���ѡ�еIJ����µ����в�������
+        dv.RowFilter="lc_uplevel = '"+ TreeDept.SelectedValue +"'";
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LlessonCat)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLessonCat.lc_name ;
+       
+        txtDesc.Text = _logic.GetLessonCat.lc_desc;
+       
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLessonCat.ID > 0 ? _logic.GetLessonCat.Update() : _logic.GetLessonCat.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLessonCat.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+   
+     
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+        if (!(_logic.GetLessonCat.ID > 0)) 
+       {
+           _logic.GetLessonCat.last_modified = DateTime.Now.ToString(); 
+       }
+        _logic.GetLessonCat.lc_uplevel = Convert.ToInt32(TreeDept.SelectedValue);
+      _logic.GetLessonCat.lc_name= txtName.Text ;
+
+       _logic.GetLessonCat.lc_desc = txtDesc.Text;
+     
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+     //   lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtName.Text = ""; 
+        txtDesc.Text = ""; 
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["pk_lessonCategory"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+        dv.RowFilter = "lc_uplevel = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+    }
+}
\ No newline at end of file
diff --git a/Training/.svn/text-base/LessonCategory.aspx.svn-base b/Training/.svn/text-base/LessonCategory.aspx.svn-base
new file mode 100644
index 0000000..b393fbe
--- /dev/null
+++ b/Training/.svn/text-base/LessonCategory.aspx.svn-base
@@ -0,0 +1,113 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="LessonCategory.aspx.cs" Inherits="LessonCategory" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="70%" class="Table_Border">
+    <tr>
+    <td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td   class="VLine"  > </td>
+       
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------> 
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        DataKeyNames="pk_lessonCategory"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging"  
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField ReadOnly="True" DataField="pk_lessonCategory" HeaderText="���id" visible="false"  SortExpression="pk_lessonCategory"  ></asp:BoundField>
+				<asp:BoundField DataField="lc_name" HeaderText="���" SortExpression="lc_name" ></asp:BoundField>
+				<asp:BoundField DataField="lc_desc" HeaderText="�������" SortExpression="lc_desc" ></asp:BoundField>
+			    <asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="15%" />
+                    <ItemStyle HorizontalAlign="Center" Width="15%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+         
+          <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder" width="100%">
+          <tr>
+            <td  colspan ="2" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="���"></asp:Label></td>
+                <td  >
+                 
+					<asp:TextBox ID="txtName" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                    ErrorMessage="��������� " ValidationGroup="1">��</asp:RequiredFieldValidator>
+                    </td>
+			 
+			</tr>
+			<tr>
+			  <td>
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="�������"></asp:Label></td>
+                         <td  >
+                        <asp:TextBox ID="txtDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50" Width="333px"></asp:TextBox></td>
+              </tr>
+           
+			  <tr>
+            <td  colspan ="2" class="ALine"  >
+            </td>
+            </tr>
+            
+          <!------ BUTTONS ------>
+			  <tr>
+            <td  colspan ="2"  align="center" >
+            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                
+            </td>
+            </tr>
+            <tr>
+            <td>
+            
+            </td>
+            <td align="left">
+                                                        <asp:ValidationSummary ID="ValidationSummary1" runat="server" HeaderText="������ʾ" ValidationGroup="1" />
+                                                         </td>
+                                                    <td>
+            </tr>
+            </table>
+            </asp:Panel>
+              
+       </td></tr>
+    
+    
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Training/.svn/text-base/LessonEmp.aspx.cs.svn-base b/Training/.svn/text-base/LessonEmp.aspx.cs.svn-base
new file mode 100644
index 0000000..2da6573
--- /dev/null
+++ b/Training/.svn/text-base/LessonEmp.aspx.cs.svn-base
@@ -0,0 +1,373 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class LessonEmp : PageBase
+{
+    private LlessonEmp _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LlessonEmp();
+            Databound();  
+            bindLessons();
+            bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+    //    if (!isRoleAuth) bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeEmp.Nodes.Clear();
+        BindEmpTree( "0", TreeEmp.SelectedNode, _logic.GetAllDepartments().DefaultView, _logic.GetAllEmployee().DefaultView);
+         
+         
+    }
+
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindLessons()
+    {
+        BindLessonTree("0",TreeLesson.SelectedNode,_logic.GetAllCategories().DefaultView,_logic.GetAllActiveData().Tables[0].DefaultView );
+    }
+    public void BindLessonTree(string id, TreeNode pNode, DataView deptdv, DataView empdv)
+    {
+
+        deptdv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["lc_name"] + "</em>" + row["pk_lessonCategory"];
+            node.Value = row["pk_lessonCategory"].ToString();
+            node.SelectAction = TreeNodeSelectAction.None; 
+            node.Expanded = true;
+            empdv.RowFilter = "le_category=" + node.Value;
+            foreach (DataRowView emrow in empdv)
+            {
+                TreeNode tnEmp = new TreeNode("<Strong>" + emrow["le_name"] + "</Strong>", emrow["pk_lesson"].ToString());
+                node.ChildNodes.Add(tnEmp);
+            }
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeLesson.Nodes.Add(node);
+
+
+            }
+            else
+            {
+
+                pNode.ChildNodes.Add(node);
+
+            }
+            BindLessonTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+    public void BindEmpTree(string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["dep_name"] + "</em>" + row["pk_department"];
+            node.Value = row["pk_department"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+                empdv.RowFilter = "em_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  , emrow["pk_employee"].ToString());
+                    tnEmp.ShowCheckBox = true;
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeEmp.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindEmpTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+ 
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LlessonEmp)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+
+        if (TreeLesson.SelectedValue == string.Empty) return;
+
+        ArrayList al = new ArrayList();
+        ArrayList al2del = new ArrayList();
+         
+        GetCheckedNode(TreeEmp.Nodes, al);
+
+        string tmpid;
+       DataTable dt =  _logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue));
+       for (int i = 0; i < dt.Rows.Count;i++ )
+       {
+           tmpid = dt.Rows[i]["train_student"].ToString().Trim();
+           if (al.Contains(tmpid ))
+           {
+               al.Remove(tmpid);
+           }
+           else
+           {
+               al2del.Add(tmpid);
+           }
+
+
+       }
+        if(al.Count >0 || al2del.Count >0)
+        { 
+            _logic.Initialize();
+
+ //           using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    //        _logic.GetLesson.Delete(Convert.ToInt32(TreeLesson.SelectedValue));
+
+
+                    foreach (string id in al2del)
+                    {
+                        _logic.GetTrainingDetail.ID = Convert.ToInt32(id);
+                        _logic.GetTrainingDetail.getModel();
+                        _logic.GetTrainingDetail.Delete();
+                    }
+
+                    foreach (string id in al)
+                    {
+                        _logic.GetTrainingDetail.train_lesson = Convert.ToInt32(TreeLesson.SelectedValue);
+                        _logic.GetTrainingDetail.train_student = Convert.ToInt32(id);
+                        _logic.GetTrainingDetail.Add();
+                    }
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣������ʧ�ܡ�");
+                }
+            }
+            Databound();
+
+        }
+
+    }
+
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+
+    
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+       
+      
+        //--������Ա����ѡ��
+       /*
+        if (TreeDeptEmp.SelectedNode != null) TreeDeptEmp.SelectedNode.Selected = false;
+         
+        lbAuthRole.Text = "��Ա��ɫ�嵥";
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+        * */
+        //--ѡ����Ա����ѡ�� 
+        GvRole.SelectedIndex = -1;
+            ArrayList empList = new ArrayList(); 
+            DataTable  dt =_logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue))  ;
+            foreach (DataRow dr in dt.Rows) 
+            {
+                empList.Add(dr["pk_employee"]);
+            }
+        SetCheckedNode(TreeEmp.Nodes, empList);
+
+        bindGV();
+
+    }
+ 
+   
+    void bindGV( )
+    {
+        //��Ա�γ�  �嵥
+        string nodevalue = TreeEmp.SelectedValue;
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {     
+      
+          lbEmRole.Text = TreeEmp.SelectedNode.Text + " ��Ա�γ��嵥";
+          GvRole.DataSource = _logic.GetLessionsByEmp(Convert.ToInt32(nodevalue));
+     
+       
+        }
+        GvRole.DataBind();
+
+
+        //�γ̶�Ӧ����Ա�嵥
+        if (TreeLesson.SelectedNode != null)
+        {
+            
+            lbRoleEm.Text = TreeLesson.SelectedNode.Text + " �γ���Ա�嵥";
+            GvEm.DataSource = _logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue));
+        }
+        GvEm.DataBind();
+    }
+
+    protected void TreeLesson_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GvEm.SelectedIndex = -1;
+        bindGV();
+    }
+
+
+    protected void GvRole_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        Label lb;
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                lb = new Label();
+                lb.Text = e.Row.Cells[1].Text.Trim().Equals("True") ? "��" : "��";
+                e.Row.Cells[1].Controls.Add(lb);
+                break;
+        }
+    }
+    protected void GvEm_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+         GvEm.EditIndex = e.NewEditIndex;
+        GvEm.SelectedIndex = e.NewEditIndex;
+         bindGV();
+    }
+    protected void GvEm_RowCommand(object sender, GridViewCommandEventArgs e)
+    {
+        
+    }
+    protected void GvEm_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+
+        if (GvEm.DataKeys != null)
+        {
+            string id = GvEm.DataKeys[e.RowIndex].Value.ToString();
+             
+           _logic.GetTrainingDetail.ID = Convert.ToInt32(id);
+           _logic.GetTrainingDetail.getModel();
+          
+           _logic.GetTrainingDetail.train_passed = ((CheckBox)GvEm.Rows[e.RowIndex].Cells[3].Controls[1]).Checked; 
+            _logic.GetTrainingDetail.train_passedDate = DateTime.Now.ToShortDateString();
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetTrainingDetail.Update();  
+        }
+        GvEm.EditIndex = -1;
+        GvEm.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvEm_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvEm.EditIndex = -1;
+        GvEm.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+}
\ No newline at end of file
diff --git a/Training/.svn/text-base/LessonEmp.aspx.svn-base b/Training/.svn/text-base/LessonEmp.aspx.svn-base
new file mode 100644
index 0000000..dfcd3c2
--- /dev/null
+++ b/Training/.svn/text-base/LessonEmp.aspx.svn-base
@@ -0,0 +1,104 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="LessonEmp.aspx.cs" Inherits="LessonEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table   class="Table_NoBorder" width="100%">
+  
+    <tr><td>
+     <table width="80%" class="Table_NoBorder" border="1">
+     <tr>
+     <td  style="width: 120px" ><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="�γ��б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="��Ա�б�"  /></td>
+     <td style="width: 200px" nowrap>
+        ��<asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text="�γ���Ա�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmRole" runat="server" Font-Bold="True" Text="��Ա�γ��嵥"  /></td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top"><asp:TreeView id="TreeLesson" runat="server"  ShowLines="True" ImageSet="Arrows" OnSelectedNodeChanged="listRoles_SelectedIndexChanged"   >
+         <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         <nodes>
+<asp:TreeNode Text="�������" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+</nodes>
+     </asp:TreeView></td>
+      <td valign ="top"> 
+       
+      
+      <asp:TreeView id="TreeEmp" runat="server"  ShowLines="True" ImageSet="Arrows" 
+             ����   OnSelectedNodeChanged="TreeLesson_SelectedNodeChanged"   >
+             
+             <nodes>
+<asp:TreeNode Text="������" Selected="True" Value="0" Expanded="True" SelectAction="None" ></asp:TreeNode>
+</nodes>
+  <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvEm" runat="server"   AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              DataKeyNames="pk_Train"
+              Width="100%" AllowPaging="True" OnRowEditing="GvEm_RowEditing" OnRowCancelingEdit="GvEm_RowCancelingEdit" OnRowCommand="GvEm_RowCommand" OnRowUpdating="GvEm_RowUpdating">
+              <columns>
+<asp:BoundField ReadOnly="True" DataField="pk_Train" SortExpression="pk_Train" HeaderText="pk_Train" visible="false"></asp:BoundField>
+<asp:BoundField ReadOnly="True" DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField> 
+<asp:BoundField ReadOnly="True" DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+<asp:TemplateField HeaderText="���"><EditItemTemplate>
+<asp:CheckBox id="CheckBox1" runat="server" __designer:wfdid="w12" Checked='<%# Bind("train_passed") %>'></asp:CheckBox><ASP:CHECKBOXFIELD /> 
+</EditItemTemplate>
+<ItemTemplate>
+<asp:CheckBox id="CheckBox2" runat="server" __designer:wfdid="w14" Checked='<%# Bind("train_passed") %>' Enabled="false" ></asp:CheckBox>
+</ItemTemplate>
+</asp:TemplateField>
+<asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif" ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True"></asp:CommandField>
+</columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top" ><asp:gridview id="GvRole" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1" AllowPaging="True" OnRowDataBound="GvRole_RowDataBound"��>
+           <columns>
+<asp:BoundField DataField="le_NAME" SortExpression="le_NAME" HeaderText="���γ�&quot;"></asp:BoundField>
+<asp:BoundField DataField="train_passed" SortExpression="train_passed" HeaderText="�Ƿ����"></asp:BoundField>
+<asp:BoundField HtmlEncode="False" DataFormatString="{0:yyyy-MM-dd}" DataField="train_passedDate" SortExpression="train_passedDate" HeaderText="���ʱ��"></asp:BoundField>
+</columns>
+           <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+           <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+           <alternatingrowstyle cssclass="AlternatingItemStyle" />
+       </asp:gridview></td>
+      
+     </tr>
+     
+     
+     
+     </table>
+      
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+             
+                <!--input type="button" id="ButtonCancel" onclick="reset()"  class="Button"	value="ȡ���޸�" NAME="ButtonCancel"--></td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Training/.svn/text-base/LessonView.aspx.cs.svn-base b/Training/.svn/text-base/LessonView.aspx.cs.svn-base
new file mode 100644
index 0000000..4bd2389
--- /dev/null
+++ b/Training/.svn/text-base/LessonView.aspx.cs.svn-base
@@ -0,0 +1,320 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using ZhangPu.Gov.Logical;
+using Tracen.Utils;
+
+public partial class LessonView : PageBase
+{
+    private Llesson _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            _logic = new Llesson();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        //�󶨿γ̷��� 
+        DataView dvDept = new DataView(_logic.GetAllActivedCategories());
+         
+      
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+        //�󶨿γ̷�����ѡ�еĿγ̷����µ����пγ�����
+        DataView dv = TreeDept.SelectedValue != "0" ? new DataView(_logic.GetLessonsByCat(Convert.ToInt32(TreeDept.SelectedValue))) : new DataView(_logic.GetAllActiveData().Tables[0]);
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (Llesson)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLesson.le_name;
+        txtDesc.Text = _logic.GetLesson.le_desc;
+        txtLocation.Text = _logic.GetLesson.le_location;
+    //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = _logic.GetLesson.le_xuefen.ToString();
+        txtTrainer.Text = _logic.GetLesson.le_trainer;
+    //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = _logic.GetLesson.le_startdate;
+        txtEndDate.Text = _logic.GetLesson.le_enddate;
+      
+ 
+ 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+     //   DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLesson.ID > 0 ? _logic.GetLesson.Update() : _logic.GetLesson.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLesson.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+   
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+        if (_logic.GetLesson.ID > 0) 
+       {
+           _logic.GetLesson.last_modified = DateTime.Now.ToString(); 
+        
+       }
+       _logic.GetLesson.le_category = Convert.ToInt32(TreeDept.SelectedValue);
+
+      
+     _logic.GetLesson.le_name =  txtName.Text ;
+      _logic.GetLesson.le_desc  =txtDesc.Text ;
+      _logic.GetLesson.le_location  =txtLocation.Text ;
+       //    txtMaster.Text = _logic.GetLesson.le_master;
+   �� _logic.GetLesson.le_xuefen = Convert.ToInt32(txtXunFen.Text);
+    �� _logic.GetLesson.le_trainer = txtTrainer.Text;��
+      _logic.GetLesson.le_startdate  = txtStartDate.Text;
+      _logic.GetLesson.le_enddate =txtEndDate.Text  ;��
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+       
+    }
+
+    private void ClearDetail()
+    { 
+        txtName.Text = "";
+        txtDesc.Text = "";
+        txtLocation.Text = "";
+        //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = "";
+        txtTrainer.Text = "";
+        //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = "";
+        txtEndDate.Text = "";
+      
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["pk_lessonCategory"].ToString();
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")
+             dv.RowFilter = "le_category = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        
+    }
+   
+
+    
+ 
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+      
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "��ѵ����.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();  
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+    
+}
\ No newline at end of file
diff --git a/Training/.svn/text-base/LessonView.aspx.svn-base b/Training/.svn/text-base/LessonView.aspx.svn-base
new file mode 100644
index 0000000..052050d
--- /dev/null
+++ b/Training/.svn/text-base/LessonView.aspx.svn-base
@@ -0,0 +1,170 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" EnableEventValidation = "false" AutoEventWireup="true" CodeFile="LessonView.aspx.cs" Inherits="LessonView" %>
+<%@   MasterType   VirtualPath="~/masterPage.master"   %>   
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ 
+<table width="100%" class="Table_NoBorder">
+   
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td><td width="1" class="VLine" ></td>
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        
+       
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="pk_lesson"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging"  
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField  Visible="False"  ReadOnly="True" DataField="pk_lesson" HeaderText="��Աid" SortExpression="pk_lesson" ></asp:BoundField>
+				<asp:BoundField DataField="le_name" HeaderText="�γ�" SortExpression="le_name">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_desc" HeaderText="˵��" SortExpression="le_desc" HtmlEncode="False"    >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_startdate" HeaderText="��ʼ����" SortExpression="le_startdate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+                	<asp:BoundField DataField="le_enddate" HeaderText="��������" SortExpression="le_enddate" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" >
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_location" HeaderText="�ص�" SortExpression="le_location">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_xuefen" HeaderText="ѧ��" SortExpression="le_xuefen">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+				<asp:BoundField DataField="le_trainer" HeaderText="��ʦ" SortExpression="le_trainer">
+                    <ItemStyle Wrap="False" />
+                    <HeaderStyle Wrap="False" />
+                </asp:BoundField>
+			
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�鿴"��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            
+        </asp:gridview>
+        <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+       <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                            <!------ THE ADD /DELETE AREA ------>
+                                            <table    align="left">
+                                             <tr>
+                                              <td class="ALine" nowrap colspan="6" >
+                                               </td>
+                                              </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text='�γ�'></asp:Label></td>
+                                                    <td nowrap align="left">
+                                                        <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                        </td>
+                                                        <td nowrap colspan="4">     </td>
+                                                     </tr>
+                                                     <tr>       
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbstartdate" runat="server" CssClass="Label" Text='��ʼ����'></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtStartDate" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>&nbsp;
+                                                    </td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbEndDate" runat="server" CssClass="Label" Text="��������" /></td>
+                                                    <td  >
+                                                        <asp:TextBox ID="txtEndDate" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>&nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td >
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ѧ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtXunFen" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True">0</asp:TextBox>
+                                                        &nbsp;
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="��ʦ"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtTrainer" runat="server" CssClass="TextBox" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="������" visible="false"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtMaster" CssClass="TextBox" runat="server" MaxLength="25" visible="false">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="lblocation" runat="server" CssClass="Label" Text="�ص�" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtLocation" CssClass="TextBox" runat="server" MaxLength="300" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbDesc" runat="server" CssClass="Label" Text="�γ̽���" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtDesc" CssClass="TextBox" runat="server" MaxLength="500" Height="104px"
+                                                            TextMode="MultiLine" Width="478px" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="6" align="center">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td align="left">
+                                                        &nbsp;&nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+       </td></tr>
+    
+  ��
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Training/Lesson.aspx b/Training/Lesson.aspx
new file mode 100644
index 0000000..2f3105d
--- /dev/null
+++ b/Training/Lesson.aspx
@@ -0,0 +1,192 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" EnableEventValidation="false"
+    AutoEventWireup="true" CodeFile="Lesson.aspx.cs" Inherits="Lesson" %>
+
+<%@ MasterType VirtualPath="~/masterPage.master" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
+    <table width="100%" class="Table_NoBorder">
+        <tr>
+            <td>
+                <table width="100%" class="Table_Border">
+                    <tr>
+                        <td width="50" height="200" align="left" valign="top">
+                            <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged"
+                                ImageSet="Arrows">
+                                <nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </nodes>
+                                <selectednodestyle backcolor="Azure" bordercolor="Transparent" />
+                            </asp:TreeView>
+                        </td>
+                        <td width="1" class="VLine">
+                        </td>
+                        <td align="left" valign="top">
+                            <!------ THE DATA GRID AREA ------>
+                            <table width="90%">
+                                <tr>
+                                    <td>
+                                        <asp:gridview id="GridView1" CssClass="DataGrid" PageSize="10" PagerStyle-HorizontalAlign="Right"
+                                            runat="server" AutoGenerateColumns="False" OnRowEditing="GridView1_RowEditing"
+                                            DataKeyNames="ID" OnRowDeleting="GridView1_RowDeleting" AllowPaging="True"
+                                            OnPageIndexChanging="GridView1_PageIndexChanging" OnSorting="GridView1_Sorting"
+                                            OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="99%" ShowFooter="True"
+                                            EmptyDataText='û�����ݡ�'>
+                                            <selectedrowstyle cssclass="SelectedItemStyle"></selectedrowstyle>
+                                            <headerstyle cssclass="HeaderStyle" horizontalalign="Center"></headerstyle>
+                                            <rowstyle cssclass="ItemStyle" horizontalalign="Center"></rowstyle>
+                                            <alternatingrowstyle cssclass="AlternatingItemStyle"></alternatingrowstyle>
+                                            <columns>
+				<asp:BoundField  Visible="False"  ReadOnly="True" DataField="ID" HeaderText="��Աid" SortExpression="ID" ></asp:BoundField>
+				<asp:BoundField DataField="le_name" HeaderText="�γ�" SortExpression="le_name">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_startdate" HeaderText="��ʼ����" SortExpression="le_startdate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                	<asp:BoundField DataField="le_enddate" HeaderText="��������" SortExpression="le_enddate" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_location" HeaderText="�ص�" SortExpression="le_location">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_xuefen" HeaderText="ѧ��" SortExpression="le_xuefen">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_trainer" HeaderText="��ʦ" SortExpression="le_trainer">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+			
+			
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</columns>
+                                            <pagerstyle horizontalalign="Right" />
+                                        </asp:gridview>
+                                        <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+                                        <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+                                    </td>
+                                </tr>
+                               
+                                <tr>
+                                    <td align="center">
+                                        <!------ THE ADD /DELETE AREA ------>
+                                        <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                            <!------ THE ADD /DELETE AREA ------>
+                                            <table    align="left">
+                                             <tr>
+                                              <td class="ALine" nowrap colspan="6" >
+                                               </td>
+                                              </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text='�γ�'></asp:Label></td>
+                                                    <td nowrap align="left">
+                                                        <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                                                            ErrorMessage="�γ����Ʋ�����Ϊ��" ValidationGroup="1">��</asp:RequiredFieldValidator></td>
+                                                        <td nowrap colspan="4">     </td>
+                                                     </tr>
+                                                     <tr>       
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbstartdate" runat="server" CssClass="Label" Text='��ʼ����'></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtStartDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <cc1:CalendarExtender ID="CalendarExtender1" CssClass="MyCalendar" runat="server"
+                                                            TargetControlID="txtStartDate" FirstDayOfWeek="Monday">
+                                                        </cc1:CalendarExtender>
+                                                    </td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbEndDate" runat="server" CssClass="Label" Text="��������" /></td>
+                                                    <td  >
+                                                        <asp:TextBox ID="txtEndDate" CssClass="TextBox" runat="server" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <cc1:CalendarExtender ID="CalendarExtender4" CssClass="MyCalendar" runat="server"
+                                                            TargetControlID="txtEndDate" FirstDayOfWeek="Monday">
+                                                        </cc1:CalendarExtender>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td >
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ѧ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtXunFen" CssClass="TextBox" runat="server" MaxLength="25">0</asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtXunFen"
+                                                            ErrorMessage="������ѧ��" ValidationGroup="1">��</asp:RequiredFieldValidator>
+                                                        <asp:RegularExpressionValidator ID="RegularExpressionValidator1" runat="server" ControlToValidate="txtXunFen"
+                                                            ErrorMessage="ѧ��ӦΪ���ڵ����������" ValidationExpression="^[1-9]\d*|0$" ValidationGroup="1">��
+                                            </asp:RegularExpressionValidator>
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="��ʦ"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtTrainer" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="������" visible="false"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtMaster" CssClass="TextBox" runat="server" MaxLength="25" visible="false">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="lblocation" runat="server" CssClass="Label" Text="�ص�" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtLocation" CssClass="TextBox" runat="server" MaxLength="300" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbDesc" runat="server" CssClass="Label" Text="�γ̽���" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtDesc" CssClass="TextBox" runat="server" MaxLength="500" Height="104px"
+                                                            TextMode="MultiLine" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="6" align="center">
+                                                        <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td align="left">
+                                                        <asp:ValidationSummary ID="ValidationSummary1" runat="server" HeaderText="������ʾ" ValidationGroup="1" />
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+                                        </td>
+                                        </tr>
+                                  
+                                 
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/Training/Lesson.aspx.cs b/Training/Lesson.aspx.cs
new file mode 100644
index 0000000..11a414b
--- /dev/null
+++ b/Training/Lesson.aspx.cs
@@ -0,0 +1,327 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class Lesson :PageBase
+{
+    private Llesson _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            _logic = new Llesson();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        //�󶨿γ̷��� 
+        DataView dvDept = new DataView(_logic.GetAllActivedCategories());
+         
+      
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+        //�󶨿γ̷�����ѡ�еĿγ̷����µ����пγ�����
+        DataView dv = TreeDept.SelectedValue != "0" ? new DataView(_logic.GetLessonsByCat(Convert.ToInt32(TreeDept.SelectedValue))) : new DataView(_logic.GetAllActiveData().Tables[0]);
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (Llesson)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLesson.le_name;
+        txtDesc.Text = _logic.GetLesson.le_desc;
+        txtLocation.Text = _logic.GetLesson.le_location;
+    //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = _logic.GetLesson.le_xuefen.ToString();
+        txtTrainer.Text = _logic.GetLesson.le_trainer;
+    //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = _logic.GetLesson.le_startdate;
+        txtEndDate.Text = _logic.GetLesson.le_enddate;
+      
+ 
+ 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+     //   DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLesson.ID > 0 ? _logic.GetLesson.Update() : _logic.GetLesson.Add();
+        ClearDetail();
+        Databound();
+        DataDetail.Visible = false;
+
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLesson.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+   
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       // if (_logic.GetLesson.ID > 0) 
+       //{
+       //    _logic.GetLesson.last_modified = DateTime.Now.ToString(); 
+        
+       //}
+       _logic.GetLesson.le_category = Convert.ToInt32(TreeDept.SelectedValue);
+
+      
+     _logic.GetLesson.le_name =  txtName.Text ;
+      _logic.GetLesson.le_desc  =txtDesc.Text ;
+      _logic.GetLesson.le_location  =txtLocation.Text ;
+       //    txtMaster.Text = _logic.GetLesson.le_master;
+   �� _logic.GetLesson.le_xuefen = Convert.ToInt32(txtXunFen.Text);
+    �� _logic.GetLesson.le_trainer = txtTrainer.Text;��
+      _logic.GetLesson.le_startdate  = txtStartDate.Text;
+      _logic.GetLesson.le_enddate =txtEndDate.Text  ;��
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+         
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+       
+        txtName.Text = "";
+        txtDesc.Text = "";
+        txtLocation.Text = "";
+        //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = "";
+        txtTrainer.Text = "";
+        //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = "";
+        txtEndDate.Text = "";
+      
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")
+             dv.RowFilter = "le_category = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        DataDetail.Visible = false;
+        
+    }
+   
+
+    
+ 
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+      
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count -1].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "��ѵ����.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = true;
+        Databound();  
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+
+   
+}
\ No newline at end of file
diff --git a/Training/LessonCategory.aspx b/Training/LessonCategory.aspx
new file mode 100644
index 0000000..30bf5dc
--- /dev/null
+++ b/Training/LessonCategory.aspx
@@ -0,0 +1,113 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="LessonCategory.aspx.cs" Inherits="LessonCategory" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+    Namespace="System.Web.UI" TagPrefix="asp" %>
+��
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table width="100%" class="Table_NoBorder">
+    
+    <tr><td>
+    <table width="70%" class="Table_Border">
+    <tr>
+    <td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td>
+    <td   class="VLine"  > </td>
+       
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------> 
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging"  
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="100%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField ReadOnly="True" DataField="ID" HeaderText="���id" visible="false"  SortExpression="ID"  ></asp:BoundField>
+				<asp:BoundField DataField="lc_name" HeaderText="���" SortExpression="lc_name" ></asp:BoundField>
+				<asp:BoundField DataField="lc_desc" HeaderText="�������" SortExpression="lc_desc" ></asp:BoundField>
+			    <asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�ࡡ��" ShowDeleteButton="True" DeleteText="&lt;img src=../Images/Delete.gif border=0 title=ɾ�� onclick='return delete_click()'&gt;" ��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/edit.gif border=0 title=�޸�  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="15%" />
+                    <ItemStyle HorizontalAlign="Center" Width="15%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            
+        </asp:gridview>
+         <asp:Button ID="btn_addNew" runat="server" Text="������¼" CssClass="Button" OnClick="btnAddnew_Click" />
+         
+          <asp:Panel ID ="DataDetail" runat="server" Width="100%" Visible="false">
+       
+        <!------ THE ADD /DELETE AREA ------>
+        <table class="Table_NoBorder" width="100%">
+          <tr>
+            <td  colspan ="2" class="ALine"  >
+            </td>
+            </tr>
+			<tr><td>
+                <asp:Label ID="Label2" runat="server"  CssClass="Label" Text="���"></asp:Label></td>
+                <td  >
+                 
+					<asp:TextBox ID="txtName" runat="server"  CssClass="TextBox" MaxLength="25"></asp:TextBox>
+                <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtName"
+                    ErrorMessage="��������� " ValidationGroup="1">��</asp:RequiredFieldValidator>
+                    </td>
+			 
+			</tr>
+			<tr>
+			  <td>
+                         <asp:Label ID="Label3" runat="server"  CssClass="Label" Text="�������"></asp:Label></td>
+                         <td  >
+                        <asp:TextBox ID="txtDesc"  CssClass="Long_TextBox" runat="server" MaxLength="50" Width="333px"></asp:TextBox></td>
+              </tr>
+           
+			  <tr>
+            <td  colspan ="2" class="ALine"  >
+            </td>
+            </tr>
+            
+          <!------ BUTTONS ------>
+			  <tr>
+            <td  colspan ="2"  align="center" >
+            <asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" ValidationGroup="1" />
+                 
+                
+            </td>
+            </tr>
+            <tr>
+            <td>
+            
+            </td>
+            <td align="left">
+                                                        <asp:ValidationSummary ID="ValidationSummary1" runat="server" HeaderText="������ʾ" ValidationGroup="1" />
+                                                         </td>
+                                                    <td>
+            </tr>
+            </table>
+            </asp:Panel>
+              
+       </td></tr>
+    
+    
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Training/LessonCategory.aspx.cs b/Training/LessonCategory.aspx.cs
new file mode 100644
index 0000000..4fcc021
--- /dev/null
+++ b/Training/LessonCategory.aspx.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class LessonCategory :PageBase
+{
+    private LlessonCat _logic;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+  
+        if (!IsPostBack)
+        {
+            _logic = new LlessonCat();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+        
+     
+        //װ��ѡ�����Žڵ�IJ�������
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dv);
+        //�����б���ѡ�еIJ����µ����в�������
+        dv.RowFilter="lc_uplevel = '"+ TreeDept.SelectedValue +"'";
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LlessonCat)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLessonCat.lc_name ;
+       
+        txtDesc.Text = _logic.GetLessonCat.lc_desc;
+       
+//    chkStatus.Checked = _logic.GetRole.dr;
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLessonCat.ID > 0 ? _logic.GetLessonCat.Update() : _logic.GetLessonCat.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLessonCat.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+   
+     
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       // if (!(_logic.GetLessonCat.ID > 0)) 
+       //{
+       //    _logic.GetLessonCat.last_modified = DateTime.Now.ToString(); 
+       //}
+        _logic.GetLessonCat.lc_uplevel = Convert.ToInt32(TreeDept.SelectedValue);
+      _logic.GetLessonCat.lc_name= txtName.Text ;
+
+       _logic.GetLessonCat.lc_desc = txtDesc.Text;
+     
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+        DataDetail.Visible = true;
+     //   lbEdit.Text = addNew ? "�����¼�¼" : "�޸����м�¼";
+        btnSubmit.Enabled = true;
+    }
+
+    private void ClearDetail()
+    {
+        txtName.Text = ""; 
+        txtDesc.Text = ""; 
+        DataDetail.Visible = false;
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+      
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+                
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+        dv.RowFilter = "lc_uplevel = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+    }
+}
\ No newline at end of file
diff --git a/Training/LessonEmp.aspx b/Training/LessonEmp.aspx
new file mode 100644
index 0000000..dc42549
--- /dev/null
+++ b/Training/LessonEmp.aspx
@@ -0,0 +1,104 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" AutoEventWireup="true" CodeFile="LessonEmp.aspx.cs" Inherits="LessonEmp" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+<table   class="Table_NoBorder" width="100%">
+  
+    <tr><td>
+     <table width="80%" class="Table_NoBorder" border="1">
+     <tr>
+     <td  style="width: 120px" ><asp:Label ID="lbrole" runat="server" Font-Bold="True" Text="�γ��б�"  /> </td>
+     <td style="width: 180px"> <asp:Label ID="lbemp" runat="server" Font-Bold="True" Text="��Ա�б�"  /></td>
+     <td style="width: 200px" nowrap>
+        ��<asp:Label ID="lbRoleEm" runat="server" Font-Bold="True" Text="�γ���Ա�嵥"  /></td>
+      <td valign ="top" style="width: 200px" nowrap>
+         ��<asp:Label ID="lbEmRole" runat="server" Font-Bold="True" Text="��Ա�γ��嵥"  /></td> 
+     
+     </tr>
+     <tr>
+     <td valign ="top"><asp:TreeView id="TreeLesson" runat="server"  ShowLines="True" ImageSet="Arrows" OnSelectedNodeChanged="listRoles_SelectedIndexChanged"   >
+         <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         <nodes>
+<asp:TreeNode Text="�������" Selected="True" Value="0" Expanded="True" SelectAction="None"></asp:TreeNode>
+</nodes>
+     </asp:TreeView></td>
+      <td valign ="top"> 
+       
+      
+      <asp:TreeView id="TreeEmp" runat="server"  ShowLines="True" ImageSet="Arrows" 
+             ����   OnSelectedNodeChanged="TreeLesson_SelectedNodeChanged"   >
+             
+             <nodes>
+<asp:TreeNode Text="WMS" Selected="True" Value="0" Expanded="True" SelectAction="None" ></asp:TreeNode>
+</nodes>
+  <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+         </asp:TreeView>
+     
+     </td>
+      <td valign ="top">
+          <asp:gridview id="GvEm" runat="server"   AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              DataKeyNames="ID"
+              Width="100%" AllowPaging="True" OnRowEditing="GvEm_RowEditing" OnRowCancelingEdit="GvEm_RowCancelingEdit" OnRowCommand="GvEm_RowCommand" OnRowUpdating="GvEm_RowUpdating">
+              <columns>
+<asp:BoundField ReadOnly="True" DataField="ID" SortExpression="ID" HeaderText="ID" visible="false"></asp:BoundField>
+<asp:BoundField ReadOnly="True" DataField="EM_NAME" SortExpression="EM_NAME" HeaderText="��Ա����"></asp:BoundField> 
+<asp:BoundField ReadOnly="True" DataField="Dep_name" SortExpression="Dep_name" HeaderText="��������"></asp:BoundField>
+<asp:TemplateField HeaderText="���"><EditItemTemplate>
+<asp:CheckBox id="CheckBox1" runat="server" __designer:wfdid="w12" Checked='<%# Bind("train_passed") %>'></asp:CheckBox><ASP:CHECKBOXFIELD /> 
+</EditItemTemplate>
+<ItemTemplate>
+<asp:CheckBox id="CheckBox2" runat="server" __designer:wfdid="w14" Checked='<%# Bind("train_passed") %>' Enabled="false" ></asp:CheckBox>
+</ItemTemplate>
+</asp:TemplateField>
+<asp:CommandField InsertVisible="False" CancelImageUrl="~/Images/undo.gif" EditImageUrl="~/Images/edit.gif" ShowHeader="True" UpdateImageUrl="~/Images/save.gif" ButtonType="Image" ShowEditButton="True"></asp:CommandField>
+</columns>
+              <rowstyle cssclass="ItemStyle" horizontalalign="Center" /> 
+              <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+              <alternatingrowstyle cssclass="AlternatingItemStyle" />
+                <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+          </asp:gridview>
+        
+        
+         
+     
+     </td>
+       <td valign ="top" ><asp:gridview id="GvRole" runat="server"  AutoGenerateColumns="False"
+              CssClass="DataGrid"  emptydatatext="û�����ݡ�"  
+              ShowFooter="True"
+              Width="100%" TabIndex="1" AllowPaging="True" OnRowDataBound="GvRole_RowDataBound"��>
+           <columns>
+<asp:BoundField DataField="le_NAME" SortExpression="le_NAME" HeaderText="���γ�&quot;"></asp:BoundField>
+<asp:BoundField DataField="train_passed" SortExpression="train_passed" HeaderText="�Ƿ����"></asp:BoundField>
+<asp:BoundField HtmlEncode="False" DataFormatString="{0:yyyy-MM-dd}" DataField="train_passedDate" SortExpression="train_passedDate" HeaderText="���ʱ��"></asp:BoundField>
+</columns>
+           <rowstyle cssclass="ItemStyle" horizontalalign="Center" />
+           <headerstyle cssclass="HeaderStyle" horizontalalign="Center" />
+           <alternatingrowstyle cssclass="AlternatingItemStyle" />
+       </asp:gridview></td>
+      
+     </tr>
+     
+     
+     
+     </table>
+      
+     
+       </td></tr>
+    <tr><td class="ALine"  >
+        </td></tr> 
+     
+            <tr> 
+            <td   align="center"   >  &nbsp;<asp:Button ID="btnSubmit" runat="server" CssClass="Button" Text="��������" OnClick="btnSubmit_Click" />
+             
+                <!--input type="button" id="ButtonCancel" onclick="reset()"  class="Button"	value="ȡ���޸�" NAME="ButtonCancel"--></td>
+        </tr>
+        <tr><td style="width: 532px">
+            
+            <br/></td></tr>
+   </table>
+    
+ </asp:Content>
+
diff --git a/Training/LessonEmp.aspx.cs b/Training/LessonEmp.aspx.cs
new file mode 100644
index 0000000..5c69cb0
--- /dev/null
+++ b/Training/LessonEmp.aspx.cs
@@ -0,0 +1,373 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Transactions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class LessonEmp : PageBase
+{
+    private LlessonEmp _logic; 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+   
+        if (!IsPostBack)
+        {
+            _logic = new LlessonEmp();
+            Databound();  
+            bindLessons();
+            bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        }
+        SessionSeting();
+
+    }
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    {
+    //    bindAuth();
+    //    bindRoles();
+    //    if (!isRoleAuth) bindDeptEmp();  //�����ɫʱ��ʼ��������Ա��
+        bindGV();
+         UpdateSession();
+ 
+        
+    }
+   
+    
+
+
+    /// <summary>
+    /// �󶨲��ż��û�
+    /// </summary>
+    private void bindDeptEmp()
+    {
+        TreeEmp.Nodes.Clear();
+        BindEmpTree( "0", TreeEmp.SelectedNode, _logic.GetAllDepartments().DefaultView, _logic.GetAllEmployee().DefaultView);
+         
+         
+    }
+
+    /// <summary>
+    ///�󶨽�ɫ
+    /// </summary>
+    private void bindLessons()
+    {
+        BindLessonTree("0",TreeLesson.SelectedNode,_logic.GetAllCategories().DefaultView,_logic.GetAllActiveData().Tables[0].DefaultView );
+    }
+    public void BindLessonTree(string id, TreeNode pNode, DataView deptdv, DataView empdv)
+    {
+
+        deptdv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["lc_name"] + "</em>" + row["ID"];
+            node.Value = row["ID"].ToString();
+            node.SelectAction = TreeNodeSelectAction.None; 
+            node.Expanded = true;
+            empdv.RowFilter = "le_category=" + node.Value;
+            foreach (DataRowView emrow in empdv)
+            {
+                TreeNode tnEmp = new TreeNode("<Strong>" + emrow["le_name"] + "</Strong>", emrow["ID"].ToString());
+                node.ChildNodes.Add(tnEmp);
+            }
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeLesson.Nodes.Add(node);
+
+
+            }
+            else
+            {
+
+                pNode.ChildNodes.Add(node);
+
+            }
+            BindLessonTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+    public void BindEmpTree(string id, TreeNode pNode, DataView deptdv,DataView empdv)
+    {
+
+        deptdv.RowFilter = "dep_mastdept = '" + id + "'";
+        foreach (DataRowView row in deptdv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = "<em>" + row["dep_name"] + "</em>" + row["ID"];
+            node.Value = row["ID"].ToString();
+             node.SelectAction = TreeNodeSelectAction.None;
+            node.ShowCheckBox = false;
+            node.Expanded = true;
+                empdv.RowFilter = "em_dept=" + node.Value;
+                foreach (DataRowView emrow in empdv)
+                {
+                    TreeNode tnEmp = new TreeNode("<Strong>" + emrow["em_name"] + "</Strong>"  , emrow["ID"].ToString());
+                    tnEmp.ShowCheckBox = true;
+                    node.ChildNodes.Add(tnEmp); 
+                }
+            if (pNode == null)
+                //˵���Ǹ��ڵ�
+            {
+            
+                TreeEmp.Nodes.Add(node);
+                 
+      
+            }
+            else
+            { 
+              
+                pNode.ChildNodes.Add(node); 
+               
+            }
+            BindEmpTree(node.Value, node, new DataView(deptdv.Table), new DataView(empdv.Table));
+
+        }
+    }
+
+ 
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (LlessonEmp)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    
+    /************************************** protected methods (event listeners) ********************************/
+
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+
+        if (TreeLesson.SelectedValue == string.Empty) return;
+
+        ArrayList al = new ArrayList();
+        ArrayList al2del = new ArrayList();
+         
+        GetCheckedNode(TreeEmp.Nodes, al);
+
+        string tmpid;
+       DataTable dt =  _logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue));
+       for (int i = 0; i < dt.Rows.Count;i++ )
+       {
+           tmpid = dt.Rows[i]["train_student"].ToString().Trim();
+           if (al.Contains(tmpid ))
+           {
+               al.Remove(tmpid);
+           }
+           else
+           {
+               al2del.Add(tmpid);
+           }
+
+
+       }
+        if(al.Count >0 || al2del.Count >0)
+        { 
+            _logic.Initialize();
+
+ //           using (TransactionScope trans = new TransactionScope())
+            {
+                try
+                {
+                    //        _logic.GetLesson.Delete(Convert.ToInt32(TreeLesson.SelectedValue));
+
+
+                    foreach (string id in al2del)
+                    {
+                        _logic.GetTrainingDetail.ID = Convert.ToInt32(id);
+                        _logic.GetTrainingDetail.getModel();
+                        _logic.GetTrainingDetail.Delete();
+                    }
+
+                    foreach (string id in al)
+                    {
+                        _logic.GetTrainingDetail.train_lesson = Convert.ToInt32(TreeLesson.SelectedValue);
+                        _logic.GetTrainingDetail.train_student = Convert.ToInt32(id);
+                        _logic.GetTrainingDetail.Add();
+                    }
+
+  //                  trans.Complete();
+                }
+                catch (MyException)
+                {
+                    throw;
+                }
+                catch (Exception)
+                {
+                    throw new Exception("�����쳣������ʧ�ܡ�");
+                }
+            }
+            Databound();
+
+        }
+
+    }
+
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+
+
+    }
+
+ void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues )
+ {
+        foreach(TreeNode node in tnc)
+        {
+            if(node.Checked)
+������ {
+������     checkedvalues.Add(node.Value);
+                 
+            }
+            GetCheckedNode(node.ChildNodes, checkedvalues);
+       }
+}
+
+    void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+    {
+        foreach (TreeNode node in tnc)
+        { 
+            node.Checked = setcheckedvalues.Contains(Convert.ToInt32(node.Value)); 
+             
+            SetCheckedNode(node.ChildNodes, setcheckedvalues);
+        }
+    }
+
+
+    private void chgOperTxt(bool addNew)
+    {
+ 
+        btnSubmit.Enabled = true;
+        
+    }
+
+    
+
+
+    protected void listRoles_SelectedIndexChanged(object sender, EventArgs e)
+    {
+       
+      
+        //--������Ա����ѡ��
+       /*
+        if (TreeDeptEmp.SelectedNode != null) TreeDeptEmp.SelectedNode.Selected = false;
+         
+        lbAuthRole.Text = "��Ա��ɫ�嵥";
+        GvRole.DataSource = null;
+        GvRole.DataBind();
+        * */
+        //--ѡ����Ա����ѡ�� 
+        GvRole.SelectedIndex = -1;
+            ArrayList empList = new ArrayList(); 
+            DataTable  dt =_logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue))  ;
+            foreach (DataRow dr in dt.Rows) 
+            {
+                empList.Add(dr["ID"]);
+            }
+        SetCheckedNode(TreeEmp.Nodes, empList);
+
+        bindGV();
+
+    }
+ 
+   
+    void bindGV( )
+    {
+        //��Ա�γ�  �嵥
+        string nodevalue = TreeEmp.SelectedValue;
+        if (nodevalue.Length >0 && nodevalue  != "0")  //selected node is an employee
+        {     
+      
+          lbEmRole.Text = TreeEmp.SelectedNode.Text + " ��Ա�γ��嵥";
+          GvRole.DataSource = _logic.GetLessionsByEmp(Convert.ToInt32(nodevalue));
+     
+       
+        }
+        GvRole.DataBind();
+
+
+        //�γ̶�Ӧ����Ա�嵥
+        if (TreeLesson.SelectedNode != null)
+        {
+            
+            lbRoleEm.Text = TreeLesson.SelectedNode.Text + " �γ���Ա�嵥";
+            GvEm.DataSource = _logic.GetEmpByLesson(Convert.ToInt32(TreeLesson.SelectedValue));
+        }
+        GvEm.DataBind();
+    }
+
+    protected void TreeLesson_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GvEm.SelectedIndex = -1;
+        bindGV();
+    }
+
+
+    protected void GvRole_RowDataBound(object sender, GridViewRowEventArgs e)
+    {
+        Label lb;
+        switch (e.Row.RowType)
+        {
+            case DataControlRowType.DataRow:
+                lb = new Label();
+                lb.Text = e.Row.Cells[1].Text.Trim().Equals("True") ? "��" : "��";
+                e.Row.Cells[1].Controls.Add(lb);
+                break;
+        }
+    }
+    protected void GvEm_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+         GvEm.EditIndex = e.NewEditIndex;
+        GvEm.SelectedIndex = e.NewEditIndex;
+         bindGV();
+    }
+    protected void GvEm_RowCommand(object sender, GridViewCommandEventArgs e)
+    {
+        
+    }
+    protected void GvEm_RowUpdating(object sender, GridViewUpdateEventArgs e)
+    {
+
+        if (GvEm.DataKeys != null)
+        {
+            string id = GvEm.DataKeys[e.RowIndex].Value.ToString();
+             
+           _logic.GetTrainingDetail.ID = Convert.ToInt32(id);
+           _logic.GetTrainingDetail.getModel();
+          
+           _logic.GetTrainingDetail.train_passed = ((CheckBox)GvEm.Rows[e.RowIndex].Cells[3].Controls[1]).Checked; 
+            _logic.GetTrainingDetail.train_passedDate = DateTime.Now.ToShortDateString();
+            //_logic.GetTrainingDetail.operater =
+            _logic.GetTrainingDetail.Update();  
+        }
+        GvEm.EditIndex = -1;
+        GvEm.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+    protected void GvEm_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+    {
+        GvEm.EditIndex = -1;
+        GvEm.SelectedIndex = e.RowIndex;
+        bindGV();
+    }
+}
\ No newline at end of file
diff --git a/Training/LessonView.aspx b/Training/LessonView.aspx
new file mode 100644
index 0000000..ebf3e82
--- /dev/null
+++ b/Training/LessonView.aspx
@@ -0,0 +1,170 @@
+<%@ Page Language="C#" MasterPageFile="../masterPage.master" EnableEventValidation = "false" AutoEventWireup="true" CodeFile="LessonView.aspx.cs" Inherits="LessonView" %>
+<%@   MasterType   VirtualPath="~/masterPage.master"   %>   
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ 
+<table width="100%" class="Table_NoBorder">
+   
+    <tr><td>
+    <table width="100%" class="Table_Border">
+    <tr><td width="50" height="200" align="left"  valign="top">
+        <asp:TreeView ID="TreeDept" runat="server" ShowLines="True" OnSelectedNodeChanged="TreeDept_SelectedNodeChanged" ImageSet="Arrows">
+            <Nodes>
+                <asp:TreeNode Text="����" Value="0" Expanded="True" Selected="True"></asp:TreeNode>
+            </Nodes>
+            <SelectedNodeStyle BackColor="Azure" BorderColor="Transparent" />
+        </asp:TreeView>
+    </td><td width="1" class="VLine" ></td>
+    <td    align="left" valign="top"> <!------ THE DATA GRID AREA ------>
+        
+        
+       
+        <asp:gridview   id="GridView1"  CssClass="DataGrid"   
+							 PageSize="10" PagerStyle-HorizontalAlign="Right"
+                        runat="server" 
+                        AutoGenerateColumns="False" 
+                        OnRowEditing="GridView1_RowEditing" 
+                        DataKeyNames="ID"
+                        OnRowDeleting="GridView1_RowDeleting" 
+                        AllowPaging="True" 
+                        OnPageIndexChanging="GridView1_PageIndexChanging"  
+                        OnSorting="GridView1_Sorting"  OnSelectedIndexChanged="GridView1_SelectedIndexChanged" Width="99%" ShowFooter="True" EmptyDataText='û�����ݡ�'>
+                        
+                        <SelectedRowStyle CssClass="SelectedItemStyle"></SelectedRowStyle>
+							<HeaderStyle CssClass="HeaderStyle" HorizontalAlign="Center"></HeaderStyle>
+							<RowStyle CssClass="ItemStyle" HorizontalAlign="Center"></RowStyle>
+							<AlternatingRowStyle CssClass="AlternatingItemStyle"></AlternatingRowStyle>
+						 
+            <Columns>
+				<asp:BoundField  Visible="False"  ReadOnly="True" DataField="ID" HeaderText="��Աid" SortExpression="ID" ></asp:BoundField>
+				<asp:BoundField DataField="le_name" HeaderText="�γ�" SortExpression="le_name">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_desc" HeaderText="˵��" SortExpression="le_desc" HtmlEncode="False"    >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_startdate" HeaderText="��ʼ����" SortExpression="le_startdate"  DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+                	<asp:BoundField DataField="le_enddate" HeaderText="��������" SortExpression="le_enddate" DataFormatString="{0:yyyy-MM-dd}" HtmlEncode="False" >
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_location" HeaderText="�ص�" SortExpression="le_location">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_xuefen" HeaderText="ѧ��" SortExpression="le_xuefen">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+				<asp:BoundField DataField="le_trainer" HeaderText="��ʦ" SortExpression="le_trainer">
+                    <ItemStyle Wrap="False" HorizontalAlign="Center"/>
+                    <HeaderStyle Wrap="False" HorizontalAlign="Center"/>
+                </asp:BoundField>
+			
+				<asp:BoundField DataField="dr" HeaderText="����" SortExpression="dr" Visible="False" ></asp:BoundField>
+			 
+				<asp:CommandField HeaderText="�鿴"��ShowHeader="True" ShowSelectButton="True" SelectText="&lt;img src=../Images/detail.gif border=0 title=�鿴  &gt;">
+                    <HeaderStyle HorizontalAlign="Center" Width="10%" />
+                    <ItemStyle HorizontalAlign="Center" Width="10%" />
+                </asp:CommandField>
+			</Columns>
+            <PagerStyle HorizontalAlign="Right" />
+            
+        </asp:gridview>
+        <asp:Button ID="Button1" runat="server" Text="����Excel" CssClass="Button" OnClick="Excel_Click" />
+       <asp:Panel ID="DataDetail" runat="server" Width="100%" Visible="false">
+                                            <!------ THE ADD /DELETE AREA ------>
+                                            <table    align="left">
+                                             <tr>
+                                              <td class="ALine" nowrap colspan="6" >
+                                               </td>
+                                              </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label2" runat="server" CssClass="Label" Text='�γ�'></asp:Label></td>
+                                                    <td nowrap align="left">
+                                                        <asp:TextBox ID="txtName" runat="server" CssClass="TextBox" MaxLength="25" ReadOnly="True"></asp:TextBox>
+                                                        </td>
+                                                        <td nowrap colspan="4">     </td>
+                                                     </tr>
+                                                     <tr>       
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbstartdate" runat="server" CssClass="Label" Text='��ʼ����'></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtStartDate" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>&nbsp;
+                                                    </td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbEndDate" runat="server" CssClass="Label" Text="��������" /></td>
+                                                    <td  >
+                                                        <asp:TextBox ID="txtEndDate" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True"></asp:TextBox>&nbsp;
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td >
+                                                        <asp:Label ID="Label1" runat="server" CssClass="Label" Text="ѧ��"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtXunFen" CssClass="TextBox" runat="server" MaxLength="25" ReadOnly="True">0</asp:TextBox>
+                                                        &nbsp;
+                                                    </td>
+                                                    <td>
+                                                        <asp:Label ID="Label11" runat="server" CssClass="Label" Text="��ʦ"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtTrainer" runat="server" CssClass="TextBox" MaxLength="25" ReadOnly="True"></asp:TextBox></td>
+                                                    <td nowrap>
+                                                        <asp:Label ID="Label3" runat="server" CssClass="Label" Text="������" visible="false"></asp:Label></td>
+                                                    <td>
+                                                        <asp:TextBox ID="txtMaster" CssClass="TextBox" runat="server" MaxLength="25" visible="false">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <asp:Label ID="lblocation" runat="server" CssClass="Label" Text="�ص�" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtLocation" CssClass="TextBox" runat="server" MaxLength="300" Width="478px">
+                                                        </asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td nowrap>
+                                                        <asp:Label ID="lbDesc" runat="server" CssClass="Label" Text="�γ̽���" />
+                                                    </td>
+                                                    <td colspan="5" align="left">
+                                                        <asp:TextBox ID="txtDesc" CssClass="TextBox" runat="server" MaxLength="500" Height="104px"
+                                                            TextMode="MultiLine" Width="478px" ReadOnly="True"></asp:TextBox></td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="6" align="center">
+                                                        &nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td align="left">
+                                                        &nbsp;&nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                            </table>
+                                        </asp:Panel>
+       </td></tr>
+    
+  ��
+        
+   </table>
+   </td></tr>
+ </table>   
+ </asp:Content>
+
diff --git a/Training/LessonView.aspx.cs b/Training/LessonView.aspx.cs
new file mode 100644
index 0000000..93ab46e
--- /dev/null
+++ b/Training/LessonView.aspx.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+using DeiNiu.Utils;
+
+public partial class LessonView : PageBase
+{
+    private Llesson _logic;
+    protected void Page_Init() 
+    {
+
+        PostBackTrigger trigger = new PostBackTrigger();
+        trigger.ControlID = Button1.UniqueID;
+
+   //     (Button)pnGridViewProcess.FindControl("btnExcel")).UniqueID.ToString();
+
+     //   (UpdatePanel)(Page.Controls[0].FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+        ((UpdatePanel)Master.FindControl("UpdatePanel1")).Triggers.Add(trigger);
+
+}
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        
+  
+        if (!IsPostBack)
+        {
+            _logic = new Llesson();
+            Databound();
+        }
+        SessionSeting();
+    }
+ 
+    /*****************************************   private methods   ******************************************/
+
+    /// <summary>
+    /// bound the query list.
+    /// </summary>
+    private void Databound()
+    { 
+        //�󶨿γ̷��� 
+        DataView dvDept = new DataView(_logic.GetAllActivedCategories());
+         
+      
+        TreeDept.SelectedNode.ChildNodes.Clear();
+        BindTree(TreeDept.SelectedNode.Value, TreeDept.SelectedNode, dvDept);
+        //�󶨿γ̷�����ѡ�еĿγ̷����µ����пγ�����
+        DataView dv = TreeDept.SelectedValue != "0" ? new DataView(_logic.GetLessonsByCat(Convert.ToInt32(TreeDept.SelectedValue))) : new DataView(_logic.GetAllActiveData().Tables[0]);
+        GridView1.DataSource = dv;
+        GridView1.SelectedIndex = -1;
+        GridView1.DataBind();
+       
+
+        
+        UpdateSession();
+    //    btnSubmit.Enabled = false;
+        ClearDetail();
+    }
+
+    private void SessionSeting()
+    {
+        if (IsPostBack)
+        {
+            _logic = (Llesson)Session[appScope.PagelevelObj];
+        }
+    }
+
+    private void UpdateSession()
+    {
+        Session[appScope.PagelevelObj] = _logic;
+    }
+
+    /// <summary>
+    /// set data from shift object to page
+    /// </summary>
+    private void DetailDataBind()
+    {
+        DataDetail.Visible = true;
+        txtName.Text = _logic.GetLesson.le_name;
+        txtDesc.Text = _logic.GetLesson.le_desc;
+        txtLocation.Text = _logic.GetLesson.le_location;
+    //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = _logic.GetLesson.le_xuefen.ToString();
+        txtTrainer.Text = _logic.GetLesson.le_trainer;
+    //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = _logic.GetLesson.le_startdate;
+        txtEndDate.Text = _logic.GetLesson.le_enddate;
+      
+ 
+ 
+    }
+
+    /************************************** protected methods (event listeners) ********************************/
+
+    protected void btnAddnew_Click(object sender, EventArgs e)
+    {
+        chgOperTxt(true);
+        _logic.Initialize();
+        ClearDetail();
+     //   DetailDataBind();
+    }
+
+    protected void DetailsView1_PageIndexChanging(object sender, DetailsViewPageEventArgs e)
+    {
+    }
+
+    protected void GridView1_RowEditing(object sender, GridViewEditEventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[e.NewEditIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        Databound();
+        DetailDataBind();
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        SetDataBack();
+        //shifts id eq 0 means this is new one,to add; else an old one, to update
+    
+        int oper = 0;
+        oper = _logic.GetLesson.ID > 0 ? _logic.GetLesson.Update() : _logic.GetLesson.Add();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_RowDeleting(object sender, GridViewDeleteEventArgs e)
+    {
+        
+        if (GridView1 != null)
+        {
+            if (GridView1.DataKeys != null)
+            {
+                string id = GridView1.DataKeys[e.RowIndex].Value.ToString();
+                _logic.Initialize(int.Parse(id));
+            }
+        }
+
+        _logic.GetLesson.Delete();
+        ClearDetail();
+        Databound();
+    }
+
+    protected void GridView1_PageIndexChanged(object sender, EventArgs e)
+    {
+    }
+
+    protected void GridView1_PageIndexChanging(object sender, GridViewPageEventArgs e)
+    {
+        GridView1.PageIndex = e.NewPageIndex;
+        Databound();
+
+        //GridView1.DataSource = shiftLgc.getAllShifts().Tables[0];
+        //     GridView1.DataBind();    
+    }
+
+    protected void GridView1_DataBinding(object sender, EventArgs e)
+    {
+    }
+
+   
+
+    protected void GridView1_Sorting(object sender, GridViewSortEventArgs e)
+    {
+    }
+
+    //reset the page
+    protected void btnCancel_Click(object sender, EventArgs e)
+    {
+        _logic.Initialize();
+        Page_Load(this, e);
+    }
+
+    /***************************************** internal methods ********************************************/
+
+    /// <summary>
+    /// set data from page to shift object
+    /// </summary>
+    private void SetDataBack()
+    {
+        //    _logic.GetRole.operater = Session["CurrentUserID"].ToString();  todo: write a public method to handle operater,createtime,lastmodfied ... log info.
+
+       // if (_logic.GetLesson.ID > 0) 
+       //{
+       //    _logic.GetLesson.last_modified = DateTime.Now.ToString(); 
+        
+       //}
+       _logic.GetLesson.le_category = Convert.ToInt32(TreeDept.SelectedValue);
+
+      
+     _logic.GetLesson.le_name =  txtName.Text ;
+      _logic.GetLesson.le_desc  =txtDesc.Text ;
+      _logic.GetLesson.le_location  =txtLocation.Text ;
+       //    txtMaster.Text = _logic.GetLesson.le_master;
+   �� _logic.GetLesson.le_xuefen = Convert.ToInt32(txtXunFen.Text);
+    �� _logic.GetLesson.le_trainer = txtTrainer.Text;��
+      _logic.GetLesson.le_startdate  = txtStartDate.Text;
+      _logic.GetLesson.le_enddate =txtEndDate.Text  ;��
+
+    }
+
+    private void chgOperTxt(bool addNew)
+    {
+       
+    }
+
+    private void ClearDetail()
+    { 
+        txtName.Text = "";
+        txtDesc.Text = "";
+        txtLocation.Text = "";
+        //    txtMaster.Text = _logic.GetLesson.le_master;
+        txtXunFen.Text = "";
+        txtTrainer.Text = "";
+        //    txtPasswd.Text = _logic.GetEmployee.em_passwd;
+        txtStartDate.Text = "";
+        txtEndDate.Text = "";
+      
+    }
+
+    protected void GridView1_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        chgOperTxt(false);
+        if (GridView1.DataKeys != null)
+        {
+            string id = GridView1.DataKeys[GridView1.SelectedIndex].Value.ToString();
+            _logic.Initialize(int.Parse(id));
+        }
+        DetailDataBind();
+    }
+
+
+
+    public void BindTree(string id, TreeNode pNode, DataView dv)
+    {
+
+
+        dv.RowFilter = "lc_uplevel = '" + id + "'";
+        foreach (DataRowView row in dv)
+        {
+            TreeNode node = new TreeNode();
+            node.Text = row["lc_name"].ToString();
+            node.Value = row["ID"].ToString();
+            if (pNode == null)
+            //˵���Ǹ��ڵ�
+            {
+
+                TreeDept.Nodes.Add(node);
+                node.Expanded = true;
+
+            }
+            else
+            {
+                pNode.ChildNodes.Add(node);
+                node.Expanded = true;
+
+            }
+            BindTree(node.Value, node, new DataView(dv.Table));
+
+        }
+    }
+    protected void TreeDept_SelectedNodeChanged(object sender, EventArgs e)
+    {
+        GridView1.SelectedIndex = -1;
+        DataView dv = new DataView(_logic.GetAllActiveData().Tables[0]);
+         if(TreeDept.SelectedValue !="0")
+             dv.RowFilter = "le_category = '" + TreeDept.SelectedValue + "'";
+        GridView1.DataSource = dv;
+        GridView1.DataBind(); 
+        ClearDetail();
+        
+    }
+   
+
+    
+ 
+
+//���û�����淽���ᱨ�����͡�GridView���Ŀؼ���GridView1��������ھ��� runat=server �Ĵ�������
+    public override void VerifyRenderingInServerForm(Control control)
+    {
+    }
+    protected void Excel_Click(object sender, EventArgs e)
+    {
+      
+        Master.ScriptMgr.RegisterPostBackControl(this.Button1);
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count-1].Visible = false;
+        Databound();  
+        Export("application/ms-excel", "��ѵ����.xls");
+        GridView1.AllowPaging = false;
+        GridView1.Columns[GridView1.Columns.Count - 1].Visible = true;
+        Databound();  
+    }
+
+    private void Export(string FileType, string FileName)
+    {
+
+        Response.Charset = "GB2312";
+        Response.ContentEncoding = Encoding.UTF7;
+        Response.AppendHeader("Content-Disposition", "attachment;filename=" + HttpUtility.UrlEncode(FileName, Encoding.UTF8).ToString());
+        Response.ContentType = FileType;
+        EnableViewState = false;
+        StringWriter tw = new StringWriter();
+        HtmlTextWriter hw = new HtmlTextWriter(tw);
+        GridView1.RenderControl(hw);
+        Response.Write(tw.ToString());
+        Response.End();
+       
+    }
+    
+}
\ No newline at end of file
diff --git a/Web.config b/Web.config
new file mode 100644
index 0000000..6343670
--- /dev/null
+++ b/Web.config
@@ -0,0 +1,72 @@
+<configuration>
+	<configSections>
+		<sectionGroup name="devExpress">
+			<section name="themes" type="DevExpress.Web.ThemesConfigurationSection, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false"/>
+			<section name="compression" type="DevExpress.Web.CompressionConfigurationSection, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false"/>
+			<section name="settings" type="DevExpress.Web.SettingsConfigurationSection, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false"/>
+			<section name="errors" type="DevExpress.Web.ErrorsConfigurationSection, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false"/>
+			<section name="resources" type="DevExpress.Web.ResourcesConfigurationSection, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false"/>
+		</sectionGroup>
+	</configSections>
+	<appSettings>
+		<add key="DeiNiu.wms.Data.Model.Department" value="DeiNiu.wms.Data.Model.Department_Imp"/>
+		<!--add key="SqlconnectionString" value="Data Source=MYTHINKPAD;Initial Catalog=zhangpu;Persist Security Info=True;User ID=sa;Password=a"/ -->
+		<!--add key="SqlconnectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=E:\zp\Data100407\zhangpu_Data.MDF;Integrated Security=True;Connect Timeout=30;User Instance=True
+"/-->
+    <add key="SqlconnWms_erp" value="Data Source=ldj;Initial Catalog=custErp_suzou2;User ID=sa;Password=Es@cn09!"/>
+		<add key="SqlconnWMS" value="Data Source=ldj;Initial Catalog=wmsuzhou2;User ID=sa;Password=Es@cn09!"/>
+		<add key="SqlconnPlatform" value="Data Source=ldj;Initial Catalog=deiniuPlatform;User ID=sa;Password=Es@cn09! "/>
+		<add key="SqlLog" value="Off"/>
+		<add key="sessionstate" value="StateServer"/>
+	</appSettings>
+	<system.web>
+		<globalization requestEncoding="utf-8" responseEncoding="utf-8" culture="zh-CN" fileEncoding="gb2312"/>
+		<!--
+  <sessionState mode="StateServer" stateConnectionString="tcpip=127.0.0.1:42424" cookieless="false" timeout="60"/> 
+  -->
+		<customErrors mode="Off"/>
+		<!--
+          Set compilation debug="true" to insert debugging
+          symbols into the compiled page. Because this
+          affects performance, set this value to true only
+          during development.
+    -->
+		<compilation debug="true" batch="false" targetFramework="4.0">
+			<assemblies>
+				<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+				<add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+			</assemblies>
+		</compilation>
+		<httpHandlers>
+			<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true"/>
+			<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET" path="DX.ashx" validate="false"/>
+		</httpHandlers>
+		<httpModules>
+			<add name="SessionEndModule" type="view.App_Code.SessionEndModule"/>
+			<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule"/>
+		</httpModules>
+		<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+	</system.web>
+	<system.webServer>
+		<validation validateIntegratedModeConfiguration="false"/>
+		<defaultDocument>
+			<files>
+				<add value="index.aspx"/>
+			</files>
+		</defaultDocument>
+		<modules>
+			<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" name="ASPxHttpHandlerModule"/>
+		</modules>
+		<handlers>
+			<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET" path="DX.ashx" name="ASPxHttpHandlerModule" preCondition="integratedMode"/>
+		</handlers>
+	</system.webServer>
+	<devExpress>
+		<themes enableThemesAssembly="true" styleSheetTheme="" theme="" customThemeAssemblies="" baseColor="" font=""/>
+		<compression enableHtmlCompression="false" enableCallbackCompression="true" enableResourceCompression="true" enableResourceMerging="true"/>
+		<settings accessibilityCompliant="false" doctypeMode="Html5" rightToLeft="false" checkReferencesToExternalScripts="false" protectControlState="true" ieCompatibilityVersion="edge"/>
+		<errors callbackErrorRedirectUrl=""/>
+	</devExpress>
+</configuration>
diff --git a/Web.sitemap b/Web.sitemap
new file mode 100644
index 0000000..66daf51
--- /dev/null
+++ b/Web.sitemap
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0" >
+    
+  
+   <siteMapNode url="" title="得牛WMS"  description="">
+     <siteMapNode url="~/index.aspx" title="系统首页"  description=""/>
+     <siteMapNode url="~/ShowNewsCate.aspx" title="更多信息"  description=""/>
+     <siteMapNode url="~/showError.aspx" title="错误提示"  description=""/>
+     <siteMapNode url="~/Desktop.aspx" title="我的桌面"  description=""/>
+     <siteMapNode url="~/login.aspx" title="系统登录"  description=""/>
+      <siteMapNode url="" title="系统管理"  description="">
+        <siteMapNode url="~/Dict/RoleEmp.aspx" title="角色分配"  description="" />
+        <siteMapNode url="~/Dict/RoleAuth.aspx" title="权限分配"  description="" />
+        <siteMapNode url="~/Dict/AuthorityMain.aspx" title="权限维护"  description="" />
+        <siteMapNode url="~/Dict/RoleMain.aspx" title="角色维护"  description="" />
+        <siteMapNode url="~/Dict/PublicNewsMain.aspx" title="信息维护"  description="" />
+     </siteMapNode>
+
+    <siteMapNode url="" title="绩效考核管理"  description="">
+    
+      <siteMapNode url="~/Project/ProjectApprove.aspx?authTpe=200" title="项目考核"  description="" />
+      <siteMapNode url="~/Project/ProjectsQuery.aspx" title="绩效查询"  description="" /> 
+      
+    </siteMapNode>
+
+
+     <siteMapNode url="" title="项目信息管理"  description="">
+       <siteMapNode url="~/Project/ProjectMain.aspx" title="我的项目"  description="" />
+       <siteMapNode url="~/Project/WorkplanMain.aspx" title="工作日志"  description="" />
+       <siteMapNode url="~/Project/WorkReport.aspx" title="工作总结"  description="" />
+       <siteMapNode url="~/Project/ProjectApprove.aspx?authTpe=100" title="项目审批"  description="" />
+       <siteMapNode url="~/Project/ProjectCenter.aspx" title="项目维护"  description="" />
+        
+     </siteMapNode>
+
+     <siteMapNode url="" title="基础信息管理"  description="">
+       <siteMapNode url="~/Dict/DeptMain.aspx" title="组织架构"  description="" />
+       <siteMapNode url="~/Dict/EmployeeMain.aspx" title="用户信息"  description="" />
+       <siteMapNode url="~/Dict/DeptEmp.aspx" title="用户分配"  description="" />
+
+     </siteMapNode>
+     <siteMapNode url="" title="培训管理"  description="">
+       <siteMapNode url="~/Training/Lesson.aspx" title="课程维护"  description="" />
+       <siteMapNode url="~/Training/LessonCategory.aspx" title="科目维护"  description="" />
+       <siteMapNode url="~/Training/LessonEmp.aspx" title="学员分配"  description="" />
+       <siteMapNode url="~//Training/LessonView.aspx" title="课程浏览"  description="" />
+       
+     </siteMapNode>
+   </siteMapNode>
+</siteMap>
diff --git a/ZhangPuStyle.css b/ZhangPuStyle.css
new file mode 100644
index 0000000..25e4f94
--- /dev/null
+++ b/ZhangPuStyle.css
@@ -0,0 +1,560 @@
+body
+{
+	background-color:#FFFFFF;
+	margin-left: 0;
+	margin-top: 0;
+	margin-right: 0;
+	font-family: Arial,Verdana;
+	font-size: 10pt;
+	background:url(Images/bg.gif) repeat-x;
+}
+
+
+
+A 
+{
+	FONT-WEIGHT: normal;   COLOR:#333333; FONT-FAMILY: Arial;
+	text-decoration:none;
+}
+A:active 
+{
+	FONT-WEIGHT: normal;   COLOR: #333333; FONT-FAMILY: Arial; text-decoration:none;
+}
+A:visited 
+{
+	FONT-WEIGHT: normal;   COLOR:   Gray; FONT-FAMILY: Arial; text-decoration:none;
+}
+A:hover 
+{
+	FONT-WEIGHT: normal;  COLOR: #000; FONT-FAMILY: Arial; TEXT-DECORATION: underline
+}
+
+/* Table Class*/
+ 
+.Table_NoBorder
+{
+	 
+	font-weight: normal;
+	color:#666666;
+	background-color:Transparent;
+	border-width: 0px;
+	border-style: solid;
+	
+}
+.Table_Border
+{
+	font-family: Arial,Verdana, Helvetica,serif,sans-serif;
+	 
+	font-weight: 100;
+	background-color:White;
+ /* 	border-color:Olive; */
+	border-color: #5B8200; 
+	border-width: 1px;
+	border-style: solid;
+}
+.Table_Table
+{
+	 
+	font-weight: normal;
+	color:#858585;
+	background-color:Transparent;
+	border-width: 1px;
+	border-style: solid;
+}
+
+/* Header */
+.HEADER
+{
+	background-color:Green;
+}
+
+/*Label Class*/
+.Label
+{
+	 
+	font-size: 9pt;
+	font-weight:normal;
+	height: 19px;
+	font-style:normal;
+	background-color :Transparent ;
+	color :#858585;
+}
+.Label_Title
+{
+	color :#3A3A3A;
+	font-size:15pt ;	
+	font-weight:bold;
+	font-family :Serif;
+}
+.Label_Header
+{
+	 
+	
+	font-size: 9pt;
+	font-weight:bold;
+	height: 19px;
+	color :#3A3A3A;
+}
+
+/*TextBox style */
+.TextBox
+{
+	height: 15PX;
+	width: 150PX;
+	font-size:15px;
+	font-family:Arial;
+	 
+}
+.TextBox_Long
+{
+	height: 15PX;
+	font-size:11px;
+	font-family:Arial;
+}
+.TextBox_Show
+{
+	height: 19PX;
+	width: 150PX;
+	font-size:11px;
+	font-family:Arial;
+	 
+	background-color:#D3D3D3;
+    width:100px;
+    
+	
+}
+.TextBox_Show_Long
+{
+	height: 19PX;
+	font-size:11px;
+	font-family:Arial;
+	color:#3A3A3A;
+	background-color:#E0E0E0;
+ 
+	border-width: 1px;	
+}
+.TextBox_NoBorder
+{
+	height: 19PX;
+	width: 150PX;
+	font-size:11px;
+	font-family:Arial;
+	color:#3A3A3A;
+	background-color:White;
+ 
+	border-width: 0px;	
+}
+
+/*DropDownList Style*/
+.DropDownList
+{
+	height: 20px;
+	width: 150px;
+	border-color:Gray;
+	border-style: none;
+	border-width: 0px;
+	background-color:White;
+	font-size:11px;
+	font-family:Arial;
+}
+.CheckBox,.RadioButton
+{
+	font-size:9pt;
+	font-family:Arial;
+	font-weight:normal;
+	height: 19px;
+	font-style:normal;
+}
+
+/*Button style */
+.Button
+{	
+	background-image:url(./images/button_100.gif);
+	background-repeat :repeat-x ;
+	background-color:Transparent;	
+	width :100px;
+	color :#5B8200;
+	border-style :none ;
+	font-family:Arial;
+}
+
+.Button_login
+{	
+	background-image:url(./images/button_101.gif);
+	background-repeat :repeat-x ;
+	background-color:Transparent;	
+	width :70px;
+	color :White;
+	border-style :none ;
+	font-family:Arial;
+}
+
+.Button_120
+{	
+	background-image:url(./images/button_120.gif);
+	background-repeat :repeat-x ;
+	background-color:White;
+	width :120px;
+	color :#5B8200;
+	border-style :none ;	
+	font-family:Arial;
+}
+.Button_150
+{	
+	background-image:url(./images/button_150.gif);
+	background-repeat :repeat-x ;
+	background-color:White;
+	width :150px;
+	color :#5B8200;
+	border-style :none ;	
+	font-family:Arial;
+}
+.Button_UpLoad
+{
+}
+.Button_DownLoad
+{
+}
+
+/*DataList*/
+.DataList
+{
+	font-size:8pt;
+	font-weight: normal;
+	color:#666666;
+	border-width: 0px;
+}
+
+/*DataGrid Style */
+.DataGrid
+{
+	font-size:9pt;
+	font-weight: normal;
+	border-width:1px;
+	border-color:#858585;
+	border-left-style :none;
+}
+.HeaderStyle
+{
+	font-weight: bold;
+	font-size: 9pt;
+	font-weight: normal;
+	border-color: #858585;
+	color :#3A3A3A;
+	text-align: left;
+	 background-color:#ECF1D9  ;
+	/*background-color: #FFE0C0;*/
+	border-left-style :none ;
+	border-right-style :none ;
+}
+.ItemStyle
+{
+	font-size: 9pt;
+	background-color: White;	
+	border-color :#D5D5D5;
+	color :#666666;
+	border-left-style :none ;
+	border-right-style :none ;
+	border-bottom-width :1;
+	border-top-width :1;
+	text-align:left ;
+	
+	 
+	
+}
+.SelectedItemStyle
+{
+	font-size: 9pt;
+	background-color:#FFE0C0;
+	border-color :#D5D5D5;
+	color :white;
+	border-left-style :none ;
+	border-right-style :none ;
+	border-bottom-width :1;
+	border-top-width :1;
+	text-align:left ;
+	background:url(Images/bg_SelectedItem.gif) repeat-x;
+}
+.AlternatingItemStyle
+{
+	font-size: 9pt;
+	/*background-color:InfoBackground;	*/
+	background-color : #EDF7FF;	
+	border-color  :#D5D5D5;
+	color :#666666;
+	border-left-style :none ;
+	border-right-style :none ;
+	border-bottom-width :1;
+	border-top-width :1;
+	text-align:left ;
+}
+.PagerStyle
+{
+
+}
+
+.Banner
+{
+	background-color:#60B6FF ;
+/*	background-image :url(./images/head11.gif);
+	background-repeat :  no-repeat ;
+*/
+	font-size :large ;
+	color :White ;
+	font-family :Arial;
+	font-weight :Bold ;
+}
+ 
+.FBannerText
+{
+	background-color:Transparent ;
+	font-size :9pt;
+	font-family :Arial ;
+	font-weight :bold ;
+	color :#666666 ;
+}
+ .ILeft
+{
+	background-color:Transparent ;
+	/*
+	background-image :url(./images/Left.gif);
+	background-repeat :no-repeat ;*/
+}
+.MTop
+{
+	background-color:Transparent ;
+	background-image :url(./images/m_top.gif);
+	background-repeat :no-repeat ;
+}
+.LTop
+{
+	background-color:Transparent ;
+	background-image :url(./images/t_top.gif);
+	background-repeat :no-repeat ;
+}
+.LMid
+{
+	background-color:Transparent ;
+	background-image :url(./images/t_mid.gif);
+	background-repeat :repeat ;
+}
+.LBel
+{
+	background-color:Transparent ;
+	background-image :url(./images/t_below.gif);
+	background-repeat :no-repeat ;
+}
+/*pseudoclasses*/
+.LMenu 
+{
+	font-weight:bold;
+	FONT-SIZE: 12px;
+	COLOR:Black;
+	FONT-FAMILY: Arial;
+	TEXT-DECORATION: none;
+}
+.LMenu:active 
+{
+	font-weight:bold;
+	FONT-SIZE: 12px;
+	COLOR:Black;
+	FONT-FAMILY: Arial;
+	TEXT-DECORATION: none
+}
+.LMenu:visited 
+{
+	font-weight:bold;
+	FONT-SIZE: 12px;
+	COLOR:Black;
+	FONT-FAMILY: Arial;
+	TEXT-DECORATION:none
+}
+.LMenu:hover 
+{
+	font-weight:bold;
+	FONT-SIZE: 12px;
+	COLOR: #0e0084;
+	FONT-FAMILY: Arial;
+	TEXT-DECORATION: none
+}
+.LAbout 
+{
+	font-weight:bold;
+	FONT-SIZE: 22px;
+	COLOR:#605b84;
+	FONT-FAMILY: Arial;
+}
+.LAbout:active
+{
+	font-weight:bold;
+	FONT-SIZE: 22px;
+	COLOR:#605b84;
+	FONT-FAMILY: Arial;
+}
+.LAbout:visited 
+{
+	font-weight:bold;
+	FONT-SIZE: 22px;
+	COLOR:#605b84;
+	FONT-FAMILY: Arial;
+}
+.LAbout:hover
+{
+	font-weight:bold;
+	FONT-SIZE: 22px;
+	COLOR:#605b84;
+	FONT-FAMILY: Arial;
+}
+.LINE
+{
+	background-image :url(./images/line_dot2.gif);
+	background-repeat :repeat-x ;
+	background-position:center;
+	height: 20px;
+}
+.LLine
+{
+	background-image :url(./images/line_dot.gif);
+	background-repeat :repeat-x ;
+	height: 1px;
+}
+.ALine
+{
+	background-image :url(./images/dot_green.gif);
+	background-repeat :repeat-x ;
+	height :30px;
+	background-position:center;
+}
+.ALineNoheight
+{
+	background-image :url(./images/dot_green.gif);
+	background-repeat :repeat-x ;
+	height :5px;
+	background-position:center;
+}
+.VLine
+{
+	background-image :url(./images/dot_green.gif);
+	background-repeat :repeat-y ;
+	width :1px;
+	background-position:center;
+}
+.RED
+{
+	color:Red;
+}
+.file
+{
+	/*border-color: #CCCCCC;
+	border-style: solid;*/
+	border-width: 1px;
+	width:385px;
+	height: 19px;	
+	font-size:11px;
+	color:#3A3A3A;
+	background-color:White;
+	 
+}
+/*wyj*/
+.top_bg{
+background:url(Images/bg_top_tit.gif) repeat-x  ;
+color: #EDF7FF ;
+width:200px;
+line-height:30px
+
+}
+.bg_top_title
+{ 
+background:url(Images/bg_top_tit.gif) repeat-x;
+color:#FFFFFF
+}
+.Table_border1{ border:1px solid #7197AC; padding:2px;}
+.Table_border2{ border:1px solid #C9D5E1; margin:2px;}
+.left{
+border:1px solid #C9D5E1;
+background-color:#EDF7FF;
+height:18px}
+.tree_in{
+padding:10px;}
+/*tree*/
+.title_tree{
+width:100%;
+height:30px;
+/**/
+background:url(Images/bg_top_tit.gif) repeat-x;
+color:white;
+line-height:30px;
+text-align:center}
+.left_title
+{
+/*background:url(Images/bg_left.gif) repeat-x;*/
+color:#265AA3;
+width:200px;
+}
+.3boder{
+border-left-color:#000000;
+border-left-width:1px;
+border-left-style:solid;
+}
+.2boder{
+border-left:1px solid #C6D7DF ;
+border-right:1px solid #C6D7DF ;
+}
+.news_line{
+background:url(Images/ancor1.gif) no-repeat left;
+padding-left:20px;
+font-size:16px;
+border-bottom:1px dotted #D5696C;
+color:#A30206;
+padding-top:10px;
+line-height:20px
+}
+.site_map{
+background:url(Images/ancor1.gif) no-repeat left;
+padding-left:13px;
+font-size:16px;
+border-bottom:1px ;
+color:#A30206;
+padding-top:10px;
+line-height:20px
+}��
+.right{
+border:1px solid #C9D5E1;
+height:18px}
+.news_table
+{
+padding-top:5px;
+	font-size: 9pt;
+	font-weight: normal;
+	color:#666666;
+	background-color:Transparent;
+	border:1px solid #CCCCCC;
+	margin-top:8px ;
+	margin-bottom:5px ;
+	margin-right:8px ;
+	margin-left:5px ;
+	background:url(Images/bg_news.gif) repeat-x top;
+	
+}
+
+.MyCalendar.ajax__calendar_container {
+    border:1px solid #646464;
+    background-color: Window;
+    color: red;
+}
+.MyCalendar.ajax__calendar_other .ajax__calendar_day,
+.MyCalendar .ajax__calendar_other .ajax__calendar_year {
+    color: black;
+}
+.MyCalendar.ajax__calendar_hover .ajax__calendar_day,
+.MyCalendar.ajax__calendar_hover .ajax__calendar_month,
+.MyCalendar.ajax__calendar_hover .ajax__calendar_year {
+    color: black;
+}
+.MyCalendar.ajax__calendar_active .ajax__calendar_day,
+.MyCalendar.ajax__calendar_active .ajax__calendar_month,
+.MyCalendar.ajax__calendar_active .ajax__calendar_year {
+    color: black;
+    font-weight:bold;
+}
+ 
\ No newline at end of file
diff --git a/changes.txt b/changes.txt
new file mode 100644
index 0000000..1884fbb
--- /dev/null
+++ b/changes.txt
@@ -0,0 +1,14 @@
+2011.03.30
+
+�����ϵĵ÷���ʾ������������λС��
+
+alter  table t_project alter column pj_score numeric(18, 4) 
+
+
+2011.03.31
+
+projectEXt_imp.cs. line 174
+
+������ȫ����Ŀ�����ּܷ����������⡣
+
+desktop �ı� desktop����ʾ�ֵܷĸ�ʽ��int��double.
\ No newline at end of file
diff --git a/index.aspx b/index.aspx
new file mode 100644
index 0000000..940afc3
--- /dev/null
+++ b/index.aspx
@@ -0,0 +1,73 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="index.aspx.cs" Inherits="index"  %>
+ 
+ 
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+ 
+ <table width="98%" align="center">
+ 
+  <asp:Repeater id="RepeaterTop" runat="server" OnItemDataBound="RepeaterTop_ItemDataBound">   
+  
+     <itemtemplate> 
+       
+            <tr><td class="news_line"  ><strong> <%# DataBinder.Eval(Container.DataItem,"auth_name") %> </strong></td></tr>
+            <tr><td    >
+            <asp:Repeater id="RepeaterSecond" runat="server" OnItemDataBound="RepeaterSecond_ItemDataBound">   
+      
+             <itemtemplate>
+              
+             <div style="float:left; width:45%;"  class="news_table" align="left">
+			  <strong> <div style="margin:5px 0px;"> &nbsp;&nbsp;&nbsp;&nbsp;<%# DataBinder.Eval(Container.DataItem,"auth_name") %>&nbsp; &nbsp;<a href='ShowNewsCate.aspx?CateID=<%# DataBinder.Eval(Container.DataItem,"ID") %>&upID=<%# DataBinder.Eval(Container.DataItem,"auth_uplevel") %>' target="_blank"> 查看全部...</a></div></strong>
+                   
+                          <asp:Repeater id="RepeaterThird" runat="server"  >   
+ 
+                             <itemtemplate> 
+                                   <div style="  width:98%;" align="left"> 
+                                   
+                                  &nbsp;&nbsp;&nbsp;&nbsp; · <a href='ShowNews.aspx?NewsID=<%# DataBinder.Eval(Container.DataItem,"ID") %>' target="_blank"><%# FormatShowContent((string)DataBinder.Eval(Container.DataItem, "news_title"),25) %></a>&nbsp;<%# DataBinder.Eval(Container.DataItem, "create_time", "{0:MM/dd} ")%></div>  
+              
+                             </itemtemplate>
+
+
+                            </asp:repeater>  
+             
+               </div>   
+              
+               </itemtemplate>
+
+            </asp:repeater>  
+         </td></tr>
+             
+    </itemtemplate>
+</asp:repeater> 
+
+  <tr><td> &nbsp;&nbsp;</td></tr>
+  
+  <tr><td align="center">
+  
+ <marquee style="color:red;font-size:20px; " direction="up" height="18" scrollamount="1"   onMouseOver="this.scrollDelay=500"  onMouseOut="this.scrollDelay=1">
+ <asp:Repeater id="RepeaterMarquee" runat="server"  >    
+   <itemtemplate> 
+ <strong> &nbsp;&nbsp; <%# DataBinder.Eval(Container.DataItem,"news_title") %></strong><br />
+ 
+<%# DataBinder.Eval(Container.DataItem,"news_content") %>
+ 
+ <br /> 
+  </itemtemplate></asp:repeater></marquee>
+     
+     </td></tr>
+
+     <tr>
+     <td>
+      
+      
+           
+         &nbsp;</td>
+      
+     </tr>
+    
+ </table>   
+   
+   
+  
+</asp:Content>
+
diff --git a/index.aspx.cs b/index.aspx.cs
new file mode 100644
index 0000000..ddcd9da
--- /dev/null
+++ b/index.aspx.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+
+public partial class index : Page
+{
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      //  if(!IsPostBack)
+      //      Session[appScope.PagelevelObj] = this;
+     
+        //  if (!IsPostBack)
+        //     bindData();
+
+        Response.Redirect("login.aspx");
+
+    }
+
+    private void InitializeComponent()
+    {
+
+    }
+
+
+   void bindData()
+   {
+       LPublicNews logic = new LPublicNews();
+       DataView dv = logic.QueryTopCatagory().DefaultView;
+       RepeaterTop.DataSource = dv;
+       RepeaterTop.DataBind();
+
+       RepeaterMarquee.DataSource = logic.QueryMarqueen().DefaultView;
+       RepeaterMarquee.DataBind();
+        
+   }
+
+    protected void RepeaterTop_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterSecond");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+             LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryPublicInfomation().DefaultView;
+            dv.RowFilter = "auth_uplevel='" + authID + "' and auth_marqueen=0 ";
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+            
+        }
+    }
+
+    protected void RepeaterSecond_ItemDataBound(object sender, System.Web.UI.WebControls.RepeaterItemEventArgs e)
+    {
+        if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+        {
+            Repeater rpColumnNews = (Repeater)e.Item.FindControl("RepeaterThird");
+            //找到分类Repeater关联的数据项
+            DataRowView rowv = (DataRowView)e.Item.DataItem;
+            //提取分类ID
+            string authID = Convert.ToString(rowv["ID"]);
+            //里面的Repeater
+            LPublicNews logic = new LPublicNews();
+            DataView dv = logic.QueryNews(Convert.ToInt32(authID)).DefaultView;
+            dv =  GetTopDataViewRows(dv,3);
+            rpColumnNews.DataSource = dv;
+            rpColumnNews.DataBind();
+
+
+        }
+    }
+
+    public string FormatShowContent(string titlecontent, int titlelength)
+    {
+        if (titlecontent.Length > titlelength)
+        {
+            return titlecontent.Substring(0, titlelength);
+        }
+        else
+        {
+            for (int i = 0; i < titlelength - titlecontent.Length;i++ )
+                titlecontent += "&nbsp;";
+
+            return titlecontent;
+            
+        }
+        
+    }
+
+   private  DataView GetTopDataViewRows(DataView dv, int n)
+    {
+        DataTable dt = dv.Table.Clone();
+
+        for (int i = 0; i < n - 1; i++)
+        {
+            if (i >= dv.Count)
+            {
+                break;
+            }
+            dt.ImportRow(dv[i].Row);
+        }
+        return new DataView(dt, dv.RowFilter, dv.Sort, dv.RowStateFilter);
+    }
+   
+   
+}
diff --git a/index.aspx.resx b/index.aspx.resx
new file mode 100644
index 0000000..52a9ad3
--- /dev/null
+++ b/index.aspx.resx
@@ -0,0 +1,123 @@
+<?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="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/licenses.licx b/licenses.licx
new file mode 100644
index 0000000..f853b11
--- /dev/null
+++ b/licenses.licx
@@ -0,0 +1,4 @@
+DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7fc7bfca2443de66
+DevExpress.XtraCharts.Web.WebChartControl, DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.Web.ASPxPageControl, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.Web.ASPxGridView, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/login.aspx b/login.aspx
new file mode 100644
index 0000000..3a0036e
--- /dev/null
+++ b/login.aspx
@@ -0,0 +1,70 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="login.aspx.cs" Inherits="login"  %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+    <table width="200" class="Table_Border" align="center">
+        <tr>
+            <td nowrap align="center" style="width: 67px">
+                <asp:Label ID="lbUserName" runat="server" CssClass="Lable" Text="用户名"></asp:Label>
+            </td>
+            <td nowrap>
+                <asp:TextBox ID="txtUserName" runat="server" CssClass="TextBox" Width="101px"  ></asp:TextBox>
+            </td>
+            </tr>
+            <tr>
+            <td nowrap align="center" style="width: 67px">
+                <asp:Label ID="lbPasswd" runat="server" CssClass="Lable" Text="密码"  ></asp:Label>
+            </td>
+            <td nowrap>
+                <asp:TextBox ID="txtPasswd" runat="server" CssClass="TextBox" Width="101px" TextMode="Password"
+                    ></asp:TextBox>
+            </td>
+            </tr>
+            <tr>
+            <td nowrap align="center" style="width: 67px">
+                <asp:Label ID="Label1" runat="server" CssClass="Lable" Text="验证码" ></asp:Label>
+            </td>
+            <td nowrap>
+                <img src="showImage.aspx"
+                title='看不清楚，双击图片换一张。'
+                ondblclick="this.src = 'showImage.aspx?flag=' + Math.random() "
+                border="1">
+            </td>
+            </tr>
+             <tr>
+            <td nowrap align="center" style="width: 67px">
+                <asp:Label ID="Label2" runat="server" CssClass="Lable" Text="验证码" ></asp:Label>
+            </td>
+            <td nowrap>
+                <asp:TextBox ID="txtCheck" runat="server" CssClass="TextBox" Width="101px"  
+                   ></asp:TextBox>
+            </td>
+            </tr>
+            <tr>
+            <td colspan="2" class="ALine"></td>
+            </tr>
+            <tr>
+            <td nowrap   colspan="2"  align="center"  >
+                <asp:Button ID="lklogin" runat="server" OnClick="lklogin_Click" Text="登录"  CssClass ="Button" >
+                    
+                </asp:Button>
+               
+          
+             <asp:Button ID="btnCancelLogin" runat="server" Text="取消" CssClass ="Button" OnClick="btnCancelLogin_Click">
+                </asp:Button>
+            </td>
+        </tr>
+        
+         <tr>
+            <td nowrap colspan="2"   >
+                &nbsp;</td>
+            
+            </tr>
+               <tr>
+            <td nowrap colspan="2"><asp:Label ID="lblResult" runat="server" CssClass="Lable" Text="" ></asp:Label>
+               </td>
+            
+            </tr>
+    </table>
+                
+</asp:Content>
+
diff --git a/login.aspx.cs b/login.aspx.cs
new file mode 100644
index 0000000..6f9b9ce
--- /dev/null
+++ b/login.aspx.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections;
+using DeiNiu.wms.Logical;
+
+public partial class login : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        txtUserName.Focus();
+    }
+    protected void lklogin_Click(object sender, EventArgs e)
+    {
+
+        if (Session["checkcode"] == null) Session["checkcode"] = new Random().Next(2, 4);
+        LEmployee lem = new LEmployee();
+       
+        DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+        logobj.LoginLog(txtUserName.Text , " trying to login  ");
+            string CheckCode = this.txtCheck.Text.ToUpper();
+        bool paswdpassed = lem.Login(txtUserName.Text, txtPasswd.Text);
+        bool loginPassed = paswdpassed
+                               && Session["checkcode"].ToString().Equals(CheckCode);
+
+         if (paswdpassed) logobj.LoginLog(txtUserName.Text," passwd passed"); else logobj.LoginLog(txtUserName.Text ," passwd failed");
+            if (!loginPassed)
+            {
+                txtPasswd.Text = string.Empty;
+                lblResult.Text = "<font color=red><b>用户登录信息错误，请重新输入</b></font>";
+                logobj.LoginLog(txtUserName.Text, " login failed  ");
+              
+            }
+            else
+            {
+                lblResult.Text = "<font color=red><b>Passed</b></font>";
+                 
+                if (((ArrayList) Application["userlst"]).Contains(lem.GetEmployee.em_account))
+                {
+                    lblResult.Text = "<font color=red><b>" + lem.GetEmployee.em_account + "用户已在线，不可重复登录。</b></font>";
+                     //  return;
+                }
+                else //系统在线人数
+                {
+                    
+                    Application["usercnt"] = Convert.ToInt32(Application["usercnt"].ToString()) + 1;
+                    
+                    ((ArrayList) Application["userlst"]).Add(lem.GetEmployee.em_account);
+                     
+                }
+                DeiNiu.Utils. LoginInfo.UserId = lem.GetEmployee.ID;
+                
+                lem.GetEmployee.em_isOnline = true;
+                lem.GetEmployee.Update();
+                
+
+
+                Session["CurrentUserId"] = lem.GetEmployee.ID;
+                Session["CurrentUserAccount"] = lem.GetEmployee.em_account; 
+                Session["CurrentUser"] = lem; 
+                logobj.LoginLog(txtUserName.Text, " login succeed"); 
+                Response.Redirect("desktop.aspx");
+            }
+    }
+
+    protected void btnCancelLogin_Click(object sender, EventArgs e)
+    {
+        Response.Redirect("index.aspx");
+    }
+}
diff --git a/masterPage.master b/masterPage.master
new file mode 100644
index 0000000..cdcc3eb
--- /dev/null
+++ b/masterPage.master
@@ -0,0 +1,229 @@
+<%@ Master Language="C#" AutoEventWireup="true" CodeFile="masterPage.master.cs" Inherits="ajax.DeiNiuMasterPage" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<META http-equiv="content-type" content="text/html; charset=gb2312">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>WMS v1.0</title>
+    <link href="ZhangPuStyle.css" type="text/css" rel="stylesheet" />
+     <link href="/public/KindEditor/themes/default/default.css" rel="stylesheet" charset="utf-8" type="text/css" />
+     <script src="/public/KindEditor/kindeditor-all.js" charset="utf-8" type="text/javascript"></script>
+     <script src="/public/KindEditor/lang/zh-CN.js" charset="utf-8" type="text/javascript"></script>
+     <link rel="stylesheet" href="/public/KindEditor/plugins/code/prettify.css"  type="text/css"/> 
+     <script charset="utf-8" src="/public/KindEditor/lang/zh_CN.js" type="text/javascript"></script>
+     <script charset="utf-8" src="/public/KindEditor/plugins/code/prettify.js" type="text/javascript"></script>
+     <script type="text/javascript">
+
+         KindEditor.ready(
+     function (K) {
+         editor = K.create('#txtDesc', {
+             //�ϴ����������·��
+             uploadJson: '/pubic/KindEditor/asp.net/upload_json.ashx',
+             imageSizeLimit: '10MB', //�����ϴ�ͼƬ�����������
+             imageUploadLimit: 30, //�����ϴ�ͼƬͬʱ�ϴ�������
+             //�ļ��������������·��
+             fileManagerJson: '/pubic/KindEditor/asp.net/file_manager_json.ashx',
+             allowFileManager: true,
+             //Ҫȡֵ�������� �����������ͬ��KindEditor��ֵ��textarea�ı���
+             afterCreate: function () {
+                 var self = this;
+                 K.ctrl(document, 13, function () {
+                     self.sync();
+                     K('form[name=example]')[0].submit();
+                 });
+                 K.ctrl(self.edit.doc, 13, function () {
+                     self.sync();
+                     K('form[name=example]')[0].submit();
+                 });
+             },
+             //�ϴ���ִ�еĻص�����,��ȡ�ϴ�ͼƬ��·��
+             afterUpload: function (data) {
+                 alert(data);
+             },
+             //ͬʱ��������  
+             afterBlur: function () {
+                 this.sync();
+             },
+             width: '1000px;',
+             height: '500px;',
+             //�༭������
+             items: [
+                'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+                'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+                'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+                'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+                'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+                'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+                'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+                'anchor', 'link', 'unlink', '|', 'about'
+                ]
+         });
+     });
+     
+     </script>
+</head>
+<body>
+<div id="Container">
+
+
+    <form id="form1" name="clock" runat="server">
+
+        <script type="text/javascript" language="javascript">
+	<!-- #include file="public/JScript.js" -->
+        </script>
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+         
+        <table width="95%" align="center"  >
+            <tr>
+                <td height="74" >
+                    &nbsp;</td>
+            </tr> 
+            <tr>
+                <td>
+                    <table width=" 98% " class="Table_Border" border="0" align="center" cellspacing="2" bgcolor="#FFFFFF">
+                        <tr>
+                            <div runat="server" id="leftMenu" visible="false">
+                                <td width="150" valign="top" class="left" style="height: 530px">
+                                    <table width="150" border="0" cellpadding="0" cellspacing="0">
+                                        <tr>
+                                            <td >
+                                                <div runat="server" id="divAuhtority" class="title_tree">
+                                                    <strong>�û�Ȩ��</strong></div>
+                                                <div class="tree_in"  >
+                                                    <asp:TreeView ID="treeMenu" runat="server">
+                                                        <NodeStyle CssClass="left_title"></NodeStyle>
+                                                        <LeafNodeStyle ImageUrl="./Images/arr.gif" ForeColor="#44494F"></LeafNodeStyle>
+                                                    </asp:TreeView>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </div>
+                            <td style="height: 300px; ">
+                                <img src="./Images/1.gif" width="1" runat=server /></td>
+                            <td valign="top" bgcolor="#FFFFFF" style="height: 300px;">
+                                <table width="100%" border="0" cellpadding="0" cellspacing="0" align="center">
+                                    <tr class="top_bg" >
+                                        <td  style="height: 17px; Font-Size=Small " nowrap="nowrap">
+                                            <img src="~/Images/1.gif" width="8" runat=server /><asp:SiteMapPath ID="SiteMapPath1" runat="server"
+                                                 ForeColor="#FFFFC0" PathSeparator=">>">
+                                                <PathSeparatorStyle Font-Bold="True" ForeColor="Gold" BackColor="Transparent" BorderStyle="None" />
+                                                <CurrentNodeStyle ForeColor="White" BackColor="Transparent" Font-Bold="True" Font-Underline="False" />
+                                                <NodeStyle Font-Bold="False" ForeColor="White" />
+                                                <RootNodeStyle Font-Bold="False" ForeColor="White" />
+                                            </asp:SiteMapPath>
+                                            &nbsp;  
+                                                <input name="thetime" style="background: none; font-size: 9pt; color: White; border: 0;
+                                                    width: 138px;" />
+
+                                        </td>
+                                        <td align="center"  > 
+                                            <asp:ImageButton ID="ImageBtnHelp" runat="server" Height="21px" ImageUrl="~/Images/help.png"
+                                               OnClick="ImageButton1_Click" ToolTip="�����ʾ�����ĵ�" Width="32px"   Visible="False" />
+                                        </td>
+                                        <td  nowrap>
+                                         
+                               
+                                           
+                                
+                                        </td>
+                                        <td height="30" align="right">
+                                            <asp:Label ID="lbWelcome" runat="server" CssClass="Lable" Text="��ӭ��"></asp:Label>
+                                            &nbsp;
+                                            <asp:LinkButton ID="lkbtnLogin" runat="server" OnClick="lkbtnLogin_Click" ForeColor="#FFFFFF">�˳�</asp:LinkButton>
+                                        </td>
+                                        <td height="30" align="right">
+                                            &nbsp; 
+                                            <asp:LinkButton ID="lkIndex" runat="server" OnClick="lkIndex_Click" ForeColor="#FFFFFF" Visible="false">��ҳ</asp:LinkButton>&nbsp;
+                                            <asp:LinkButton ID="lkDesktop" runat="server" ForeColor="#FFFFFF" OnClick="lkDesktop_Click">����</asp:LinkButton>&nbsp;&nbsp; 
+                                                <asp:LinkButton ID="lkkanban" runat="server" ForeColor="#FFFFFF" 
+                                                onclick="lkkanban_Click"  >����</asp:LinkButton>&nbsp;&nbsp; 
+                                           
+                                             &nbsp;
+                                        </td>
+                                         
+                                    </tr>
+                                </table>
+                                <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                         <div style="position:absolute; z-index:100; width:100%"; align=right> </div> 
+                                <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
+                                        </asp:ContentPlaceHolder>
+                             
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+                                &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;
+                                &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="3" align="center">
+                                <br />
+                                ��
+                                ��</td>
+                        </tr>
+                         <tr>
+                         <td></td>
+                            <td colspan="2" align="center">
+                               <table width="800" border=0>
+                               <tr>
+                               <td>
+                              
+                                   &nbsp;
+                               </td>
+                               </tr>
+                               </table> 
+                                
+                                 </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </form>
+    </div>
+    <script language="JavaScript">
+    
+    
+							 function showDate()
+							{
+							    now = new Date() ;
+							   document.aspnetForm.thetime.value =now.toLocaleString()  ;
+							   
+							    setTimeout("showDate()",1000);
+							}
+							showDate();
+					 
+       // ------->
+       
+  var prm = Sys.WebForms.PageRequestManager.getInstance();
+ 
+  prm.add_initializeRequest(InitializeRequest);
+  prm.add_endRequest(EndRequest);
+ 
+  function InitializeRequest(sender, args) 
+  {
+    $get('Container').style.cursor = 'wait'; 
+  }
+ 
+  function EndRequest(sender, args) 
+  {
+    $get('Container').style.cursor = 'auto';
+  }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/masterPage.master.cs b/masterPage.master.cs
new file mode 100644
index 0000000..adef8bd
--- /dev/null
+++ b/masterPage.master.cs
@@ -0,0 +1,303 @@
+using System;
+using System.Collections;
+using System.Data;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DeiNiu.wms.Logical;
+
+namespace ajax
+{
+    public partial class DeiNiuMasterPage : System.Web.UI.MasterPage
+    {
+        public LEmployee lem; 
+        protected void Page_Load(object sender, EventArgs e)
+        { 
+            if (!string.IsNullOrEmpty(Request.QueryString["___command"]))
+            {
+                string cmd = Request.QueryString["___command"];
+                if (cmd == "ClearSession")
+                {
+                    if ((Session["CurrentUser"] != null))
+                    { 
+                     
+                       if( System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                           if (Session["CurrentUserId"] != null)
+                        {
+                        //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                            DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                            logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                        }
+                    }  
+                    Session.Abandon(); //���Session, all sessions will be clear ? no kiding, it will obsolete the current session.
+                }
+            }
+
+
+            //ҳ�治�������ز�����
+            Response.Buffer = true;
+
+            Response.ExpiresAbsolute = DateTime.Now.AddMinutes(-1);
+
+            Response.Expires = 0;
+
+            Response.CacheControl = "no-cache";
+            try
+            {
+             //   if (Session["CurrentUser"] != null)
+                    InitializeUserUi();
+            }catch(Exception){}
+           
+        }
+
+        /// <summary>
+        /// ��ǰ�û���û�е�¼
+        /// </summary>
+        void ShowLogin()
+        {
+          //  login.Visible = lem == null;
+            lbWelcome.Text =  lem != null  ? "��ӭ����" + lem.GetEmployee.em_name +",": "";
+            lkbtnLogin.Text = lem != null ? "�˳�" : "��¼";
+           // lkIndex.Visible = lem != null;
+            divAuhtority.Visible = lem != null;
+            lkDesktop.Visible = lem != null;
+            leftMenu.Visible = lem!=null;
+            lkkanban.Visible = lem != null;
+             ImageBtnHelp.Visible = leftMenu.Visible;
+        }
+ 
+        /// <summary>
+        /// �����û�Ȩ�ޣ���ʼ���û����棬�˵���
+        /// </summary>
+        public void InitializeUserUi()
+        { 
+            lem = (LEmployee)Session["CurrentUser"];
+            if (lem != null) setTree(); else treeMenu.Nodes.Clear();  
+            ShowLogin();
+           
+           
+        }
+        public UpdatePanel UpdatePanelMaster
+        {
+            get
+            {
+                return UpdatePanel1;
+            }
+        }
+
+        /// <summary>
+        /// ������ͨȨ���б�
+        /// </summary>
+        private void setTree()
+        {
+            treeMenu.Nodes.Clear();
+            BindAuthTree2("0", null, new LAuthority().getAllActiveData().Tables[0].DefaultView);
+            if (lem != null)
+            {
+             // if( lem.GetEmployee.em_account !="Root") 
+                
+                {
+                    ArrayList al = new LRoleAuthority().GetPublicAuthorityList();
+                     
+                   removeUnAuthoritedMenu(lem.AuthList ,al ,treeMenu.Nodes);
+                }
+            }
+            /* else
+        {
+            BindAuthTree2("0", null, new LRoleAuthority().GetPublicAuthorityTable().DefaultView);
+        }*/
+        }
+        void removeUnAuthoritedMenu(ArrayList toKeepAuthority,ArrayList toKeepPublic, TreeNodeCollection nd)
+        {
+           // foreach (TreeNode node in nd)
+            for (int i = 0; i < nd.Count;i++ )
+            {
+                TreeNode node = nd[i];
+          //      foreach (TreeNode cnd in node.ChildNodes)
+                for (int j = 0; j < node.ChildNodes.Count; j++)
+                {
+                    TreeNode cnd = node.ChildNodes[j];
+                    if (cnd.ChildNodes.Count > 0)
+                    {
+                        removeUnAuthoritedMenu(toKeepAuthority, toKeepPublic,cnd.ChildNodes);
+                    }
+                    else
+                        if (string.IsNullOrEmpty(cnd.NavigateUrl) || lem.GetEmployee.em_account !="Root" && !(toKeepAuthority.Contains(cnd.NavigateUrl.ToUpper()) || toKeepPublic.Contains(cnd.NavigateUrl.ToUpper())))
+                        {
+                            node.ChildNodes.Remove(cnd);
+                            j--;
+                        }
+
+                }
+                if (node.ChildNodes.Count == 0)
+                {
+                    nd.Remove(node);
+                    i--;
+                }
+            }
+        }
+   
+
+        public void BindAuthTree2(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "' and auth_publicinfomation=0";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node = new TreeNode();
+                string authLink = row["auth_link"].ToString();
+                node.Value = row["ID"].ToString();
+                node.Expanded = true;
+                if (authLink == string.Empty || authLink.Trim().Length < 6) //not *.aspx
+                {
+                    node.Text = "<strong>" + row["auth_name"] + "</strong>";
+                    node.SelectAction = TreeNodeSelectAction.None;
+                    node.ShowCheckBox = false;
+                }
+                else
+                {
+                    node.Text = row["auth_name"].ToString();
+                    node.NavigateUrl = authLink;
+                }
+
+
+                if (pNode == null)
+                    //˵���Ǹ��ڵ�
+                {
+
+                    treeMenu.Nodes.Add(node);
+
+
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                BindAuthTree2(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+
+
+        public void BindAuthTree(string id, TreeNode pNode, DataView dv)
+        {
+
+            dv.RowFilter = "auth_uplevel = '" + id + "'";
+            foreach (DataRowView row in dv)
+            {
+                TreeNode node;
+                string authLink = row["auth_link"].ToString();
+           
+           
+                if (authLink == string.Empty || authLink.Trim().Length < 6) //not *.aspx
+                {
+                    //  node = new TreeNode("<strong>" + row["auth_name"] + "</strong>",  row["ID"].ToString()  ,"","","");
+                    node = new TreeNode();
+                    node.Text = "<strong>" + row["auth_name"] + "</strong>";
+                    node.Value = row["ID"].ToString(); 
+                }
+                else
+                {
+                    node = new TreeNode(row["auth_name"].ToString(), row["ID"].ToString(), "", authLink, "");
+                }
+                node.Expanded = true;
+
+                if (pNode == null)
+                    //˵���Ǹ��ڵ�
+                {
+
+                    treeMenu.Nodes.Add(node);
+
+
+                }
+                else
+                {
+
+                    pNode.ChildNodes.Add(node);
+
+                }
+                BindAuthTree(node.Value, node, new DataView(dv.Table));
+
+            }
+        }
+     
+   
+    
+        void Login()
+        {
+
+            if (Session["CurrentUser"]==null) //not login
+            { 
+                
+                Response.Redirect("~/login.aspx");
+            }
+            else
+            { 
+                ((ArrayList)Application["userlst"]).Remove(lem.GetEmployee.em_account);
+                DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+              
+                Application["usercnt"] = Convert.ToInt32(Application["usercnt"].ToString()) - 1;
+              
+                Session.RemoveAll();
+                Session.Abandon();
+                Response.Redirect("~/login.aspx");
+            }
+         
+  
+        }
+
+        protected void lkbtnLogin_Click(object sender, EventArgs e)
+        {
+            Login();
+
+         
+        }
+
+        public ScriptManager ScriptMgr 
+        {
+            get
+            {
+                return this.ScriptManager1;
+            }
+        }
+
+        protected void lkIndex_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/index.aspx");
+        }
+
+
+        protected void lkDesktop_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/desktop.aspx");
+        }
+        protected void lklogin_Click(object sender, EventArgs e)
+        {
+            Login();
+        }
+
+        protected void LinkHelp_Click(object sender, EventArgs e)
+        {
+      �� 
+        }
+        protected void ImageButton1_Click(object sender, ImageClickEventArgs e)
+        {
+
+            string requestPage = Request.AppRelativeCurrentExecutionFilePath;
+ 
+             string helpDoc =  Request.ApplicationPath+ "/ug/"+ requestPage.Substring(2, requestPage.IndexOf(".aspx")-2)+".html";
+          //  string helpDoc = siteName + requestPage.Substring(2, requestPage.IndexOf(".aspx") - 2) + ".html";
+        //    if (!System.IO.File.Exists(Server.MapPath(helpDoc)))
+            //        helpDoc = siteName+ "/nohelpdoc.html"; //        helpDoc =  Request.ApplicationPath+ "/ug/nohelpdoc.html";
+            
+            string newWindow = "openwin('" + helpDoc + "');";
+            ScriptManager.RegisterStartupScript(UpdatePanel1, typeof(UpdatePanel), "alert", newWindow, true);
+        }
+        protected void lkkanban_Click(object sender, EventArgs e)
+        {
+            Response.Redirect("~/wms/Charts.aspx");
+        }
+}
+}
\ No newline at end of file
diff --git a/public/.svn/entries b/public/.svn/entries
new file mode 100644
index 0000000..7081cc5
--- /dev/null
+++ b/public/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/public
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+JScript.js
+file
+
+
+
+
+2011-04-01T02:51:02.492943Z
+0c195519c5832317b51564ac69179a71
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4998
+
diff --git a/public/.svn/text-base/JScript.js.svn-base b/public/.svn/text-base/JScript.js.svn-base
new file mode 100644
index 0000000..1415b3e
--- /dev/null
+++ b/public/.svn/text-base/JScript.js.svn-base
@@ -0,0 +1,218 @@
+	 
+
+   document.onkeydown = function() 
+   {
+    //����F5��F11
+    if ( window.event.keyCode == 116 || window.event.keyCode == 117 || window.event.keyCode == 122) 
+    { 
+		event.keyCode = 0;  
+		return false;
+    }
+    //���� Alt+ ����� ��,���� Alt+ ����� ��
+    if ((window.event.altKey) 
+    
+     &&((window.event.keyCode == 37) || (window.event.keyCode == 39)))  
+    {
+		return false;
+    }
+    //����CTRL+N
+    if (window.event.ctrlKey && window.event.keyCode == 78) 
+    {
+		return false;
+    }
+    //����CTRL+R
+    if (window.event.ctrlKey && window.event.keyCode == 82)
+    {
+		return false;
+    }
+    //����CTRL+H
+	if (window.event.ctrlKey && window.event.keyCode == 72)
+	{
+		return false;
+	}
+	//����CTRL+I
+	if (window.event.ctrlKey && window.event.keyCode == 73)
+	{
+		return false;
+	}
+    //����SHIFT+F10
+    if (window.event.shiftKey && window.event.keyCode == 121)
+    {
+		return false;
+    }
+    //�DZ༭������BACK SPACE
+    if (window.event.keyCode == 8)
+    {    
+     var  e= window.event.srcElement;
+    if ((e.tagName.toUpperCase() != "INPUT" && e.tagName.toUpperCase() != "TEXTAREA") || (e.type.toUpperCase() != "TEXT" && e.type.toUpperCase() != "PASSWORD" && e.type.toUpperCase() != "TEXTAREA" && e.type.toUpperCase()!="FILE") ||(!e.isContentEditable) || (e.disabled) )
+     {
+		return false;
+     }
+    }
+   }
+   /*
+   //�DZ༭�������Ҽ��˵� 
+   document.oncontextmenu = function()
+   {
+    var  e= event.srcElement;
+    if ((e.tagName != "INPUT" && e.tagName != "TEXTAREA") || (e.type.toUpperCase() != "TEXT" && e.type.toUpperCase() != "PASSWORD" && e.type.toUpperCase() != "TEXTAREA" && e.type.toUpperCase() != "FILE"))
+    //if (e.tagName != "INPUT" || e.type != "text")
+    {
+		return false;
+    }
+   }
+   */
+ 
+ 
+ function delete_click()
+ {
+    return confirm("ȷ��Ҫɾ����");
+ }
+ window.onload =function() 
+{
+	if(getcookie("height")!=null)
+	document.body.scrollTop=getcookie("height");
+}
+
+window.onunload =function () 
+{
+	setcookie("height",document.body.scrollTop);
+}
+function getcookie(sName)
+{
+	var aCookie = document.cookie.split("; ");
+	for (var i=0; i < aCookie.length; i++)
+	{
+		var aCrumb = aCookie[i].split("=");
+		if (sName == aCrumb[0]) 
+		return unescape(aCrumb[1]);
+	}
+	return null;
+}
+
+function setcookie(sName, sValue)
+{
+	date = new Date();
+	date.setTime(date.getTime()+5000);  //5 second
+	document.cookie = sName + "=" + escape(sValue) + "; expires=" + date.toGMTString();
+}
+
+
+
+ 
+
+function openwin(Name)
+{ 
+	winSub=window.open(Name,'aaa','width=780,center=1,help=no,scrollbars=1,maxnimize=yes') ;
+	winSub.focus();
+} 
+
+function get_cookie(Name)
+{ 
+	var search = Name + "=" 
+	var returnvalue = ""; 
+	if (document.cookie.length > 0) 
+	{ 
+		offset = document.cookie.indexOf(search) ;
+		if (offset != -1) 
+		{ 
+			offset += search.length 
+			end = document.cookie.indexOf(";", offset); 
+			if (end == -1) 
+			end = document.cookie.length; 
+			returnvalue=unescape(document.cookie.substring(offset, end)) ;
+			alert(returnvalue);
+		} 
+	} 
+	return returnvalue; 
+} 
+
+ function loadpopup(Name,id)
+{	
+	if (get_cookie(id)=='')
+	{
+		openwin(Name) 
+		document.cookie=id+"=yes" 
+	} 
+}
+
+function windowclose(id)
+{
+	document.cookie(id)=='';
+}
+ 
+ /*
+ function   window.onunload()   
+  {   
+      if   (event.clientX   <   0   &&   event.clientY   <   0)   
+          window.showModalDialog('~/logout.aspx' );   
+  } 
+  */
+  
+  function GetXmlHttpObject() 
+{
+    //����XMLHttpRequest���������ͺͽ���HTTP��������Ӧ
+    xmlHttpObj = null;
+    try 
+    {
+        // FireFox Opera 8.0+ Safari
+        xmlHttpObj = new XMLHttpRequest();
+        if(xmlHttpObj.overrideMimeType) 
+        {
+            xmlHttpObj.overrideMimeType('text/xml');
+        }
+    } 
+    catch(e) 
+    {
+        // IE
+        try 
+        {
+            xmlHttpObj = new ActiveXObject("Msxml2.XMLHTTP");
+        } 
+        catch(e) 
+        {
+            xmlHttpObj = new ActiveXObject("Microsoft.XMLHTTP");
+        }
+    }
+    return xmlHttpObj;
+}
+ 
+function StateChanged() 
+{
+    if(___xmlHttp.readyState == 4) 
+    { 
+        if(___xmlHttp.status == 200) 
+        {
+        } 
+        else 
+        {
+        }
+    }
+}
+ 
+var ___xmlHttp=null;
+function ClearSession() 
+{
+    
+    if(___xmlHttp==null)
+        ___xmlHttp = GetXmlHttpObject();
+    if(___xmlHttp == null) 
+        return false;
+        
+    var url = "?___command=ClearSession&___clientRandom=" + Math.random();
+ 
+    ___xmlHttp.open("GET", url, true);
+    ___xmlHttp.onreadystatechange = StateChanged;
+    ___xmlHttp.send(null);
+    
+}
+ 
+window.onbeforeunload = function() 
+{   
+      var n = window.event.screenX - window.screenLeft; 
+      var b = n > document.documentElement.scrollWidth-20; 
+      if(b && window.event.clientY < 0 || window.event.altKey)   
+      {   
+          ClearSession(); 
+      }   
+}    
diff --git a/public/JScript.js b/public/JScript.js
new file mode 100644
index 0000000..24ada79
--- /dev/null
+++ b/public/JScript.js
@@ -0,0 +1,214 @@
+
+
+document.onkeydown = function () {
+
+ alert(window.event.keyCode);
+    //����F5��F11
+    if (window.event.keyCode == 116 || window.event.keyCode == 117 || window.event.keyCode == 122) {
+        event.keyCode = 0;
+        return false;
+    }
+    //���� Alt+ ����� ��,���� Alt+ ����� ��
+    if ((window.event.altKey)
+
+     && ((window.event.keyCode == 37) || (window.event.keyCode == 39))) {
+        return false;
+    }
+    //����CTRL+N
+    if (window.event.ctrlKey && window.event.keyCode == 78) {
+        return false;
+    }
+    //����CTRL+R
+    if (window.event.ctrlKey && window.event.keyCode == 82) {
+        return false;
+    }
+    //����CTRL+H
+    if (window.event.ctrlKey && window.event.keyCode == 72) {
+        return false;
+    }
+    //����CTRL+I
+    if (window.event.ctrlKey && window.event.keyCode == 73) {
+        return false;
+    }
+    //����SHIFT+F10
+    if (window.event.shiftKey && window.event.keyCode == 121) {
+        return false;
+    }
+    //�DZ༭������BACK SPACE
+    if (window.event.keyCode == 8) {
+        var e = window.event.srcElement;
+        alert("tagName " + e.tagName.toUpperCase());
+        alert("type " + e.type.toUpperCase());
+        alert("isContentEditable " + e.isContentEditable ));
+        alert("disabled " + e.disabled);
+        if ((e.tagName.toUpperCase() != "INPUT" && e.tagName.toUpperCase() != "TEXTAREA") || (e.type.toUpperCase() != "TEXT" && e.type.toUpperCase() != "PASSWORD" && e.type.toUpperCase() != "TEXTAREA" && e.type.toUpperCase() != "FILE") || (!e.isContentEditable) || (e.disabled)) {
+            return false;
+        }
+    }
+}
+   /*
+   //�DZ༭�������Ҽ��˵� 
+   document.oncontextmenu = function()
+   {
+    var  e= event.srcElement;
+    if ((e.tagName != "INPUT" && e.tagName != "TEXTAREA") || (e.type.toUpperCase() != "TEXT" && e.type.toUpperCase() != "PASSWORD" && e.type.toUpperCase() != "TEXTAREA" && e.type.toUpperCase() != "FILE"))
+    //if (e.tagName != "INPUT" || e.type != "text")
+    {
+		return false;
+    }
+   }
+   */
+ 
+ 
+ function delete_click()
+ {
+    return confirm("ȷ��Ҫɾ����");
+ }
+ window.onload =function() 
+{
+	if(getcookie("height")!=null)
+	document.body.scrollTop=getcookie("height");
+}
+
+window.onunload =function () 
+{
+	setcookie("height",document.body.scrollTop);
+}
+function getcookie(sName)
+{
+	var aCookie = document.cookie.split("; ");
+	for (var i=0; i < aCookie.length; i++)
+	{
+		var aCrumb = aCookie[i].split("=");
+		if (sName == aCrumb[0]) 
+		return unescape(aCrumb[1]);
+	}
+	return null;
+}
+
+function setcookie(sName, sValue)
+{
+	date = new Date();
+	date.setTime(date.getTime()+5000);  //5 second
+	document.cookie = sName + "=" + escape(sValue) + "; expires=" + date.toGMTString();
+}
+
+
+
+ 
+
+function openwin(Name)
+{ 
+	winSub=window.open(Name,'aaa','width=780,center=1,help=no,scrollbars=1,maxnimize=yes') ;
+	winSub.focus();
+} 
+
+function get_cookie(Name)
+{ 
+	var search = Name + "=" 
+	var returnvalue = ""; 
+	if (document.cookie.length > 0) 
+	{ 
+		offset = document.cookie.indexOf(search) ;
+		if (offset != -1) 
+		{ 
+			offset += search.length 
+			end = document.cookie.indexOf(";", offset); 
+			if (end == -1) 
+			end = document.cookie.length; 
+			returnvalue=unescape(document.cookie.substring(offset, end)) ;
+			alert(returnvalue);
+		} 
+	} 
+	return returnvalue; 
+} 
+
+ function loadpopup(Name,id)
+{	
+	if (get_cookie(id)=='')
+	{
+		openwin(Name) 
+		document.cookie=id+"=yes" 
+	} 
+}
+
+function windowclose(id)
+{
+	document.cookie(id)=='';
+}
+ 
+ /*
+ function   window.onunload()   
+  {   
+      if   (event.clientX   <   0   &&   event.clientY   <   0)   
+          window.showModalDialog('~/logout.aspx' );   
+  } 
+  */
+  
+  function GetXmlHttpObject() 
+{
+    //����XMLHttpRequest���������ͺͽ���HTTP��������Ӧ
+    xmlHttpObj = null;
+    try 
+    {
+        // FireFox Opera 8.0+ Safari
+        xmlHttpObj = new XMLHttpRequest();
+        if(xmlHttpObj.overrideMimeType) 
+        {
+            xmlHttpObj.overrideMimeType('text/xml');
+        }
+    } 
+    catch(e) 
+    {
+        // IE
+        try 
+        {
+            xmlHttpObj = new ActiveXObject("Msxml2.XMLHTTP");
+        } 
+        catch(e) 
+        {
+            xmlHttpObj = new ActiveXObject("Microsoft.XMLHTTP");
+        }
+    }
+    return xmlHttpObj;
+}
+ 
+function StateChanged() 
+{
+    if(___xmlHttp.readyState == 4) 
+    { 
+        if(___xmlHttp.status == 200) 
+        {
+        } 
+        else 
+        {
+        }
+    }
+}
+ 
+var ___xmlHttp=null;
+function ClearSession() 
+{
+    
+    if(___xmlHttp==null)
+        ___xmlHttp = GetXmlHttpObject();
+    if(___xmlHttp == null) 
+        return false;
+        
+    var url = "?___command=ClearSession&___clientRandom=" + Math.random();
+ 
+    ___xmlHttp.open("GET", url, true);
+    ___xmlHttp.onreadystatechange = StateChanged;
+    ___xmlHttp.send(null);
+    
+}
+ 
+window.onbeforeunload = function() 
+{   
+      var n = window.event.screenX - window.screenLeft; 
+      var b = n > document.documentElement.scrollWidth-20; 
+      if(b && window.event.clientY < 0 || window.event.altKey)   
+      {   
+          ClearSession(); 
+      }   
+}    
diff --git a/public/Pager.ascx b/public/Pager.ascx
new file mode 100644
index 0000000..713275a
--- /dev/null
+++ b/public/Pager.ascx
@@ -0,0 +1,53 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="Pager.ascx.cs" Inherits="public_Pager" %>
+
+
+ 
+
+<table>
+<tr>
+<td >
+    <asp:ImageButton ID="btnFirst" runat="server" 
+        ImageUrl="~/Images/btnFirst.Image.png" onclick="btnFirst_Click" />  
+</td>
+<td >
+    <asp:ImageButton ID="btnPrev" runat="server" 
+        ImageUrl="~/Images/btnPrev.Image.png"  onclick="btnPrev_Click"/>
+</td>
+<td> 
+        <asp:TextBox ID="lblcurentpage" runat="server" Height="17px" Width="72px"></asp:TextBox>
+</td>
+<td >
+    <asp:ImageButton ID="btnNext" runat="server" 
+        ImageUrl="~/Images/btnNext.Image.png"   onclick="btnNext_Click"/>
+</td>
+<td >
+    <asp:ImageButton ID="btnLast" runat="server" 
+        ImageUrl="~/Images/btnLast.Image.png"   onclick="btnLast_Click"/>
+</td>
+
+
+<td> 
+
+
+        <asp:Label ID="lblRecordCount" runat="server" Text="总记录"></asp:Label>
+
+</td>
+<td>
+ <asp:Label ID="Label1" runat="server" Text="页数"></asp:Label>
+ </td>
+<td>
+
+    <asp:DropDownList ID="cmbPagecount" runat="server" 
+        onselectedindexchanged="cmbPagecount_SelectedIndexChanged">
+    </asp:DropDownList>
+
+</td>
+<td>
+<asp:DropDownList ID="comPagesize" runat="server" 
+        onselectedindexchanged="comPagesize_SelectedIndexChanged">
+    </asp:DropDownList>
+</td>
+ 
+</tr>
+</table>
+
diff --git a/public/Pager.ascx.cs b/public/Pager.ascx.cs
new file mode 100644
index 0000000..fae5ab6
--- /dev/null
+++ b/public/Pager.ascx.cs
@@ -0,0 +1,296 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class public_Pager : System.Web.UI.UserControl
+{
+
+    /**/
+    /// <summary>
+    /// 申明委托
+    /// </summary>
+    /// <param name="e"></param>
+    /// <returns></returns>
+    public delegate int EventPagingHandler(EventPagingArg e);
+    /**/
+    /// <summary>
+    /// 分页控件呈现
+    /// </summary>
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+
+
+
+    public event EventPagingHandler EventPaging;
+    /**/
+    /// <summary>
+    /// 每页显示记录数
+    /// </summary>
+    private int _pageSize = 100;
+    /**/
+    /// <summary>
+    /// 每页显示记录数
+    /// </summary>
+    public int PageSize
+    {
+        get { return _pageSize; }
+        set
+        {
+            _pageSize = value;
+            GetPageCount();
+        }
+    }
+
+    private int _nMax = 0;
+    /**/
+    /// <summary>
+    /// 总记录数
+    /// </summary>
+    public int NMax
+    {
+        get { return _nMax; }
+        set
+        {
+            _nMax = value;
+            GetPageCount();
+        }
+    }
+
+    private int _pageCount = 0;
+    /**/
+    /// <summary>
+    /// 页数=总记录数/每页显示记录数
+    /// </summary>
+    public int PageCount
+    {
+        get { return _pageCount; }
+        set { _pageCount = value; }
+    }
+
+    private int _pageCurrent = 0;
+    /**/
+    /// <summary>
+    /// 当前页号
+    /// </summary>
+    public int PageCurrent
+    {
+        get { return _pageCurrent; }
+        set { _pageCurrent = value; }
+    }
+
+    /// <summary>
+    /// 设置页面大小
+    /// </summary>
+    private void GetPageCount()
+    {
+        if (this.NMax > 0)
+        {
+            this.PageCount = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(this.NMax) / Convert.ToDouble(this.PageSize)));
+            // lblPageCount.Text = " / " + PageCount.ToString();
+            lblcurentpage.Text = PageCurrent.ToString() + " / " + PageCount.ToString();
+            //lblPageCount1.Text = "每页 "+PageSize .ToString ()+" 条，共 "+PageCount.ToString()+" 页";
+            //   lblPageCount1.Text = "Page no: " + PageSize.ToString() + ",Total:" + PageCount.ToString() + " pages";
+            //   lblPageCount1.Text =   PageSize.ToString() + "/" + PageCount.ToString() ;
+        }
+        else
+        {
+            this.PageCount = 0;
+        }
+    }
+
+    /**/
+    /// <summary>
+    /// 翻页控件数据绑定的方法 关键是这步，都是调用这里
+    /// </summary>
+    public void Bind()
+    {
+        if (this.EventPaging != null)
+        {
+            this.NMax = this.EventPaging(new EventPagingArg(this.PageCurrent));
+        }
+
+        if (this.PageCurrent > this.PageCount)
+        {
+            this.PageCurrent = this.PageCount;
+        }
+        if (this.PageCount == 1)
+        {
+            this.PageCurrent = 1;
+        }
+        lblcurentpage.Text = PageCurrent.ToString() + " / " + PageCount.ToString();
+        lblRecordCount.Text = "共" + NMax.ToString() + "条";
+        // lblRecordCount.Text = "Total: " + NMax.ToString() + " records";
+
+
+        btnPrev.Enabled = true;
+        btnFirst.Enabled = true;
+        btnLast.Enabled = true;
+        btnNext.Enabled = true;
+
+        if (this.PageCurrent == 1)
+        {
+            this.btnPrev.Enabled = false;
+            this.btnFirst.Enabled = false;
+        }
+
+
+        if (this.PageCurrent == this.PageCount)
+        {
+            this.btnLast.Enabled = false;
+            this.btnNext.Enabled = false;
+        }
+
+        if (this.NMax == 0)
+        {
+            btnNext.Enabled = false;
+            btnLast.Enabled = false;
+            btnFirst.Enabled = false;
+            btnPrev.Enabled = false;
+        }
+        cmbPagecount.Items.Clear();
+        for (int i = 1; i <= PageCount; i++)
+        {
+            cmbPagecount.Items.Add(i.ToString());
+            //if(i== PageCurrent - 1){
+            //    cmbPagecount.SelectedItem = cmbPagecount.Items[i - 1];
+            //}
+        }
+        this.cmbPagecount.SelectedIndexChanged -= new System.EventHandler(this.cmbPagecount_SelectedIndexChanged);
+        cmbPagecount.SelectedIndex = PageCurrent - 1;
+        this.cmbPagecount.SelectedIndexChanged += new System.EventHandler(this.cmbPagecount_SelectedIndexChanged);
+
+
+        comPagesize.Items.Clear();
+        for (int i = 100; i <= 900; i += 100)
+        {
+            comPagesize.Items.Add(i.ToString());
+
+        }
+        /*
+        for (int i = 50; i <= 500; i+=50)
+        {
+            comPagesize.Items.Add(i.ToString());
+                
+        }
+        */
+        for (int i = 1000; i <= 5000; i += 1000)
+        {
+            comPagesize.Items.Add(i.ToString());
+        }
+        this.comPagesize.SelectedIndexChanged -= new System.EventHandler(this.comPagesize_SelectedIndexChanged);
+        //   comPagesize.SelectedIndex = this._pageSize / 100 -1;
+        //  comPagesize.SelectedIndex = this._pageSize / 50 - 1  ;
+        comPagesize.SelectedIndex = _pageSize <= 1000 ? this._pageSize / 100 - 1 : 10 + _pageSize / 1000 - 2;
+        this.comPagesize.SelectedIndexChanged += new System.EventHandler(this.comPagesize_SelectedIndexChanged);
+
+
+    }
+    /// <summary>
+    /// 首页
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void btnFirst_Click(object sender, ImageClickEventArgs e)
+    {
+        PageCurrent = 1;
+        this.Bind();
+    }
+    //上一页
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void btnPrev_Click(object sender, ImageClickEventArgs e)
+    {
+        PageCurrent -= 1;
+        if (PageCurrent <= 0)
+        {
+            PageCurrent = 1;
+        }
+        this.Bind();
+    }
+    /// <summary>
+    /// 下一页
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void btnNext_Click(object sender, ImageClickEventArgs e)
+    {
+        this.PageCurrent += 1;
+        if (PageCurrent > PageCount)
+        {
+            PageCurrent = PageCount;
+        }
+        this.Bind();
+    }
+    /// <summary>
+    /// 最后页
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void btnLast_Click(object sender, ImageClickEventArgs e)
+    {
+        PageCurrent = PageCount;
+        this.Bind();
+    }
+    /// <summary>
+    /// 转到新页
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public void btnGo_Click(object sender, ImageClickEventArgs e)
+    {
+        if (Int32.TryParse(cmbPagecount.SelectedItem.ToString(), out _pageCurrent))
+        {
+            this.Bind();
+        }
+    }
+
+    public void cmbPagecount_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        if (Int32.TryParse(cmbPagecount.SelectedItem.ToString(), out _pageCurrent))
+        {
+            this.Bind();
+        }
+    }
+    public void comPagesize_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        if (Int32.TryParse(comPagesize.SelectedItem.ToString(), out _pageSize))
+        {
+            GetPageCount();
+            this.Bind();
+        }
+
+
+    }
+
+
+
+
+
+
+
+
+
+     
+
+
+     
+} /**/
+/// <summary>
+/// 自定义事件数据基类
+/// </summary>
+public class EventPagingArg : EventArgs
+{
+    private int _intPageIndex;
+    public EventPagingArg(int PageIndex)
+    {
+        _intPageIndex = PageIndex;
+    }
+}
\ No newline at end of file
diff --git a/public/kindeditor/asp.net/README.txt b/public/kindeditor/asp.net/README.txt
new file mode 100644
index 0000000..24c7ad4
--- /dev/null
+++ b/public/kindeditor/asp.net/README.txt
@@ -0,0 +1,12 @@
+KindEditor ASP.NET
+
+本ASP.NET程序是演示程序，建议不要直接在实际项目中使用。
+如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ 
+使用方法:
+
+1. 解压zip文件，将所有文件复制到IIS的wwwroot/kindeditor目录下。
+
+2. 将kindeditor/asp.net/bin目录下的dll文件复制到wwwroot/bin目录下。
+
+3. 打开浏览器，输入http://localhost:[P0RT]/kindeditor/asp.net/demo.aspx。
diff --git a/public/kindeditor/asp.net/bin/LitJSON.dll b/public/kindeditor/asp.net/bin/LitJSON.dll
new file mode 100644
index 0000000..9cc439d
Binary files /dev/null and b/public/kindeditor/asp.net/bin/LitJSON.dll differ
diff --git a/public/kindeditor/asp.net/demo.aspx b/public/kindeditor/asp.net/demo.aspx
new file mode 100644
index 0000000..6c0b0e3
--- /dev/null
+++ b/public/kindeditor/asp.net/demo.aspx
@@ -0,0 +1,80 @@
+<%@ Page Language="C#" AutoEventWireup="true" validateRequest="false" %>
+
+<script runat="server">
+protected void Page_Load(object sender, EventArgs e)
+{
+    this.Label1.Text = Request.Form["content1"];
+}
+
+</script>
+
+<!doctype html>
+
+<html>
+<head runat="server">
+    <meta charset="utf-8" />
+    <title>KindEditor ASP.NET</title>
+    <link rel="stylesheet" href="../themes/default/default.css" />
+	<link rel="stylesheet" href="../plugins/code/prettify.css" />
+	<script charset="utf-8" src="../kindeditor-all.js"  type="text/javascript"></script>
+	<script charset="utf-8" src="../lang/zh-CN.js"  type="text/javascript"></script>
+	<script charset="utf-8" src="../plugins/code/prettify.js"  type="text/javascript"></script>
+	 <script type="text/javascript">
+
+	     KindEditor.ready(
+     function (K) {
+         editor = K.create('#content1', {
+             //上传处理程序的路径
+             uploadJson: '/pubic/KindEditor/asp.net/upload_json.ashx',
+             imageSizeLimit: '10MB', //批量上传图片单张最大容量
+             imageUploadLimit: 30, //批量上传图片同时上传最多个数
+             //文件管理处理程序的路径
+             fileManagerJson: '/pubic/KindEditor/asp.net/file_manager_json.ashx',
+             allowFileManager: true,
+             //要取值设置这里 这个函数就是同步KindEditor的值到textarea文本框
+             afterCreate: function () {
+                 var self = this;
+                 K.ctrl(document, 13, function () {
+                     self.sync();
+                     K('form[name=example]')[0].submit();
+                 });
+                 K.ctrl(self.edit.doc, 13, function () {
+                     self.sync();
+                     K('form[name=example]')[0].submit();
+                 });
+             },
+             //上传后执行的回调函数,获取上传图片的路径
+             afterUpload: function (data) {
+                 alert(data);
+             },
+             //同时设置这里  
+             afterBlur: function () {
+                 this.sync();
+             },
+             width: '1000px;',
+             height: '500px;',
+             //编辑工具栏
+             items: [
+                'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+                'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+                'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+                'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+                'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+                'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+                'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+                'anchor', 'link', 'unlink', '|', 'about'
+                ]
+         });
+     });
+     
+     </script>
+</head>
+<body>
+    <asp:Label ID="Label1" runat="server" Text=""></asp:Label>
+    <form id="example" runat="server">
+        <textarea id="content1" cols="100" rows="8" style="width:700px;height:200px; " runat="server"></textarea>
+        <br />
+        <asp:Button ID="Button1" runat="server" Text="提交内容" /> (提交快捷键: Ctrl + Enter)
+    </form>
+</body>
+</html>
diff --git a/public/kindeditor/asp.net/file_manager_json.ashx b/public/kindeditor/asp.net/file_manager_json.ashx
new file mode 100644
index 0000000..857e7ce
--- /dev/null
+++ b/public/kindeditor/asp.net/file_manager_json.ashx
@@ -0,0 +1,227 @@
+<%@ webhandler Language="C#" class="FileManager" %>
+
+/**
+ * KindEditor ASP.NET
+ *
+ * 本ASP.NET程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ *
+ */
+
+using System;
+using System.Collections;
+using System.Web;
+using System.IO;
+using System.Text.RegularExpressions;
+using LitJson;
+using System.Collections.Generic;
+
+public class FileManager : IHttpHandler
+{
+	public void ProcessRequest(HttpContext context)
+	{
+		String aspxUrl = context.Request.Path.Substring(0, context.Request.Path.LastIndexOf("/") + 1);
+
+		//根目录路径，相对路径
+		String rootPath = "../attached/";
+		//根目录URL，可以指定绝对路径，比如 http://www.yoursite.com/attached/
+		String rootUrl = aspxUrl + "../attached/";
+		//图片扩展名
+		String fileTypes = "gif,jpg,jpeg,png,bmp";
+
+		String currentPath = "";
+		String currentUrl = "";
+		String currentDirPath = "";
+		String moveupDirPath = "";
+
+		String dirPath = context.Server.MapPath(rootPath);
+		String dirName = context.Request.QueryString["dir"];
+		if (!String.IsNullOrEmpty(dirName)) {
+			if (Array.IndexOf("image,flash,media,file".Split(','), dirName) == -1) {
+				context.Response.Write("Invalid Directory name.");
+				context.Response.End();
+			}
+			dirPath += dirName + "/";
+			rootUrl += dirName + "/";
+			if (!Directory.Exists(dirPath)) {
+				Directory.CreateDirectory(dirPath);
+			}
+		}
+
+		//根据path参数，设置各路径和URL
+		String path = context.Request.QueryString["path"];
+		path = String.IsNullOrEmpty(path) ? "" : path;
+		if (path == "")
+		{
+			currentPath = dirPath;
+			currentUrl = rootUrl;
+			currentDirPath = "";
+			moveupDirPath = "";
+		}
+		else
+		{
+			currentPath = dirPath + path;
+			currentUrl = rootUrl + path;
+			currentDirPath = path;
+			moveupDirPath = Regex.Replace(currentDirPath, @"(.*?)[^\/]+\/$", "$1");
+		}
+
+		//排序形式，name or size or type
+		String order = context.Request.QueryString["order"];
+		order = String.IsNullOrEmpty(order) ? "" : order.ToLower();
+
+		//不允许使用..移动到上一级目录
+		if (Regex.IsMatch(path, @"\.\."))
+		{
+			context.Response.Write("Access is not allowed.");
+			context.Response.End();
+		}
+		//最后一个字符不是/
+		if (path != "" && !path.EndsWith("/"))
+		{
+			context.Response.Write("Parameter is not valid.");
+			context.Response.End();
+		}
+		//目录不存在或不是目录
+		if (!Directory.Exists(currentPath))
+		{
+			context.Response.Write("Directory does not exist.");
+			context.Response.End();
+		}
+
+		//遍历目录取得文件信息
+		string[] dirList = Directory.GetDirectories(currentPath);
+		string[] fileList = Directory.GetFiles(currentPath);
+
+		switch (order)
+		{
+			case "size":
+				Array.Sort(dirList, new NameSorter());
+				Array.Sort(fileList, new SizeSorter());
+				break;
+			case "type":
+				Array.Sort(dirList, new NameSorter());
+				Array.Sort(fileList, new TypeSorter());
+				break;
+			case "name":
+			default:
+				Array.Sort(dirList, new NameSorter());
+				Array.Sort(fileList, new NameSorter());
+				break;
+		}
+
+		Hashtable result = new Hashtable();
+		result["moveup_dir_path"] = moveupDirPath;
+		result["current_dir_path"] = currentDirPath;
+		result["current_url"] = currentUrl;
+		result["total_count"] = dirList.Length + fileList.Length;
+		List<Hashtable> dirFileList = new List<Hashtable>();
+		result["file_list"] = dirFileList;
+		for (int i = 0; i < dirList.Length; i++)
+		{
+			DirectoryInfo dir = new DirectoryInfo(dirList[i]);
+			Hashtable hash = new Hashtable();
+			hash["is_dir"] = true;
+			hash["has_file"] = (dir.GetFileSystemInfos().Length > 0);
+			hash["filesize"] = 0;
+			hash["is_photo"] = false;
+			hash["filetype"] = "";
+			hash["filename"] = dir.Name;
+			hash["datetime"] = dir.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss");
+			dirFileList.Add(hash);
+		}
+		for (int i = 0; i < fileList.Length; i++)
+		{
+			FileInfo file = new FileInfo(fileList[i]);
+			Hashtable hash = new Hashtable();
+			hash["is_dir"] = false;
+			hash["has_file"] = false;
+			hash["filesize"] = file.Length;
+			hash["is_photo"] = (Array.IndexOf(fileTypes.Split(','), file.Extension.Substring(1).ToLower()) >= 0);
+			hash["filetype"] = file.Extension.Substring(1);
+			hash["filename"] = file.Name;
+			hash["datetime"] = file.LastWriteTime.ToString("yyyy-MM-dd HH:mm:ss");
+			dirFileList.Add(hash);
+		}
+		context.Response.AddHeader("Content-Type", "application/json; charset=UTF-8");
+		context.Response.Write(JsonMapper.ToJson(result));
+		context.Response.End();
+	}
+
+	public class NameSorter : IComparer
+	{
+		public int Compare(object x, object y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null)
+			{
+				return -1;
+			}
+			if (y == null)
+			{
+				return 1;
+			}
+			FileInfo xInfo = new FileInfo(x.ToString());
+			FileInfo yInfo = new FileInfo(y.ToString());
+
+			return xInfo.FullName.CompareTo(yInfo.FullName);
+		}
+	}
+
+	public class SizeSorter : IComparer
+	{
+		public int Compare(object x, object y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null)
+			{
+				return -1;
+			}
+			if (y == null)
+			{
+				return 1;
+			}
+			FileInfo xInfo = new FileInfo(x.ToString());
+			FileInfo yInfo = new FileInfo(y.ToString());
+
+			return xInfo.Length.CompareTo(yInfo.Length);
+		}
+	}
+
+	public class TypeSorter : IComparer
+	{
+		public int Compare(object x, object y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null)
+			{
+				return -1;
+			}
+			if (y == null)
+			{
+				return 1;
+			}
+			FileInfo xInfo = new FileInfo(x.ToString());
+			FileInfo yInfo = new FileInfo(y.ToString());
+
+			return xInfo.Extension.CompareTo(yInfo.Extension);
+		}
+	}
+
+	public bool IsReusable
+	{
+		get
+		{
+			return true;
+		}
+	}
+}
diff --git a/public/kindeditor/asp.net/upload_json.ashx b/public/kindeditor/asp.net/upload_json.ashx
new file mode 100644
index 0000000..4382dc9
--- /dev/null
+++ b/public/kindeditor/asp.net/upload_json.ashx
@@ -0,0 +1,121 @@
+<%@ webhandler Language="C#" class="Upload" %>
+
+/**
+ * KindEditor ASP.NET
+ *
+ * 本ASP.NET程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ *
+ */
+
+using System;
+using System.Collections;
+using System.Web;
+using System.IO;
+using System.Globalization;
+using LitJson;
+
+public class Upload : IHttpHandler
+{
+	private HttpContext context;
+
+	public void ProcessRequest(HttpContext context)
+	{
+		String aspxUrl = context.Request.Path.Substring(0, context.Request.Path.LastIndexOf("/") + 1);
+		
+		//文件保存目录路径
+		String savePath = "/public/upload/attached/";
+
+		//文件保存目录URL
+        String saveUrl = aspxUrl + "/public/upload/attached/";
+
+		//定义允许上传的文件扩展名
+		Hashtable extTable = new Hashtable();
+		extTable.Add("image", "gif,jpg,jpeg,png,bmp");
+		extTable.Add("flash", "swf,flv");
+		extTable.Add("media", "swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb");
+		extTable.Add("file", "doc,docx,xls,xlsx,ppt,htm,html,txt,zip,rar,gz,bz2");
+
+		//最大文件大小
+		int maxSize = 1000000;
+		this.context = context;
+
+		HttpPostedFile imgFile = context.Request.Files["imgFile"];
+		if (imgFile == null)
+		{
+			showError("请选择文件。");
+		}
+
+		String dirPath = context.Server.MapPath(savePath);
+		if (!Directory.Exists(dirPath))
+		{
+			showError("上传目录不存在。");
+		}
+
+		String dirName = context.Request.QueryString["dir"];
+		if (String.IsNullOrEmpty(dirName)) {
+			dirName = "image";
+		}
+		if (!extTable.ContainsKey(dirName)) {
+			showError("目录名不正确。");
+		}
+
+		String fileName = imgFile.FileName;
+		String fileExt = Path.GetExtension(fileName).ToLower();
+
+		if (imgFile.InputStream == null || imgFile.InputStream.Length > maxSize)
+		{
+			showError("上传文件大小超过限制。");
+		}
+
+		if (String.IsNullOrEmpty(fileExt) || Array.IndexOf(((String)extTable[dirName]).Split(','), fileExt.Substring(1).ToLower()) == -1)
+		{
+			showError("上传文件扩展名是不允许的扩展名。\n只允许" + ((String)extTable[dirName]) + "格式。");
+		}
+
+		//创建文件夹
+		dirPath += dirName + "/";
+		saveUrl += dirName + "/";
+		if (!Directory.Exists(dirPath)) {
+			Directory.CreateDirectory(dirPath);
+		}
+		String ymd = DateTime.Now.ToString("yyyyMMdd", DateTimeFormatInfo.InvariantInfo);
+		dirPath += ymd + "/";
+		saveUrl += ymd + "/";
+		if (!Directory.Exists(dirPath)) {
+			Directory.CreateDirectory(dirPath);
+		}
+
+		String newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt;
+		String filePath = dirPath + newFileName;
+
+		imgFile.SaveAs(filePath);
+
+		String fileUrl = saveUrl + newFileName;
+
+		Hashtable hash = new Hashtable();
+		hash["error"] = 0;
+		hash["url"] = fileUrl;
+		context.Response.AddHeader("Content-Type", "text/html; charset=UTF-8");
+		context.Response.Write(JsonMapper.ToJson(hash));
+		context.Response.End();
+	}
+
+	private void showError(string message)
+	{
+		Hashtable hash = new Hashtable();
+		hash["error"] = 1;
+		hash["message"] = message;
+		context.Response.AddHeader("Content-Type", "text/html; charset=UTF-8");
+		context.Response.Write(JsonMapper.ToJson(hash));
+		context.Response.End();
+	}
+
+	public bool IsReusable
+	{
+		get
+		{
+			return true;
+		}
+	}
+}
diff --git a/public/kindeditor/asp/JSON_2.0.4.asp b/public/kindeditor/asp/JSON_2.0.4.asp
new file mode 100644
index 0000000..ae1b383
--- /dev/null
+++ b/public/kindeditor/asp/JSON_2.0.4.asp
@@ -0,0 +1,210 @@
+<%
+'
+'	VBS JSON 2.0.3
+'	Copyright (c) 2009 Tu�rul Topuz
+'	Under the MIT (MIT-LICENSE.txt) license.
+'
+
+Const JSON_OBJECT	= 0
+Const JSON_ARRAY	= 1
+
+Class jsCore
+	Public Collection
+	Public Count
+	Public QuotedVars
+	Public Kind ' 0 = object, 1 = array
+
+	Private Sub Class_Initialize
+		Set Collection = CreateObject("Scripting.Dictionary")
+		QuotedVars = True
+		Count = 0
+	End Sub
+
+	Private Sub Class_Terminate
+		Set Collection = Nothing
+	End Sub
+
+	' counter
+	Private Property Get Counter 
+		Counter = Count
+		Count = Count + 1
+	End Property
+
+	' - data maluplation
+	' -- pair
+	Public Property Let Pair(p, v)
+		If IsNull(p) Then p = Counter
+		Collection(p) = v
+	End Property
+
+	Public Property Set Pair(p, v)
+		If IsNull(p) Then p = Counter
+		If TypeName(v) <> "jsCore" Then
+			Err.Raise &hD, "class: class", "Incompatible types: '" & TypeName(v) & "'"
+		End If
+		Set Collection(p) = v
+	End Property
+
+	Public Default Property Get Pair(p)
+		If IsNull(p) Then p = Count - 1
+		If IsObject(Collection(p)) Then
+			Set Pair = Collection(p)
+		Else
+			Pair = Collection(p)
+		End If
+	End Property
+	' -- pair
+	Public Sub Clean
+		Collection.RemoveAll
+	End Sub
+
+	Public Sub Remove(vProp)
+		Collection.Remove vProp
+	End Sub
+	' data maluplation
+
+	' encoding
+	Function jsEncode(str)
+		Dim charmap(127), haystack()
+		charmap(8)  = "\b"
+		charmap(9)  = "\t"
+		charmap(10) = "\n"
+		charmap(12) = "\f"
+		charmap(13) = "\r"
+		charmap(34) = "\"""
+		charmap(47) = "\/"
+		charmap(92) = "\\"
+
+		Dim strlen : strlen = Len(str) - 1
+		ReDim haystack(strlen)
+
+		Dim i, charcode
+		For i = 0 To strlen
+			haystack(i) = Mid(str, i + 1, 1)
+
+			charcode = AscW(haystack(i)) And 65535
+			If charcode < 127 Then
+				If Not IsEmpty(charmap(charcode)) Then
+					haystack(i) = charmap(charcode)
+				ElseIf charcode < 32 Then
+					haystack(i) = "\u" & Right("000" & Hex(charcode), 4)
+				End If
+			Else
+				haystack(i) = "\u" & Right("000" & Hex(charcode), 4)
+			End If
+		Next
+
+		jsEncode = Join(haystack, "")
+	End Function
+
+	' converting
+	Public Function toJSON(vPair)
+		Select Case VarType(vPair)
+			Case 0	' Empty
+				toJSON = "null"
+			Case 1	' Null
+				toJSON = "null"
+			Case 7	' Date
+				' toJSON = "new Date(" & (vPair - CDate(25569)) * 86400000 & ")"	' let in only utc time
+				toJSON = """" & CStr(vPair) & """"
+			Case 8	' String
+				toJSON = """" & jsEncode(vPair) & """"
+			Case 9	' Object
+				Dim bFI,i 
+				bFI = True
+				If vPair.Kind Then toJSON = toJSON & "[" Else toJSON = toJSON & "{"
+				For Each i In vPair.Collection
+					If bFI Then bFI = False Else toJSON = toJSON & ","
+
+					If vPair.Kind Then 
+						toJSON = toJSON & toJSON(vPair(i))
+					Else
+						If QuotedVars Then
+							toJSON = toJSON & """" & i & """:" & toJSON(vPair(i))
+						Else
+							toJSON = toJSON & i & ":" & toJSON(vPair(i))
+						End If
+					End If
+				Next
+				If vPair.Kind Then toJSON = toJSON & "]" Else toJSON = toJSON & "}"
+			Case 11
+				If vPair Then toJSON = "true" Else toJSON = "false"
+			Case 12, 8192, 8204
+				toJSON = RenderArray(vPair, 1, "")
+			Case Else
+				toJSON = Replace(vPair, ",", ".")
+		End select
+	End Function
+
+	Function RenderArray(arr, depth, parent)
+		Dim first : first = LBound(arr, depth)
+		Dim last : last = UBound(arr, depth)
+
+		Dim index, rendered
+		Dim limiter : limiter = ","
+
+		RenderArray = "["
+		For index = first To last
+			If index = last Then
+				limiter = ""
+			End If 
+
+			On Error Resume Next
+			rendered = RenderArray(arr, depth + 1, parent & index & "," )
+
+			If Err = 9 Then
+				On Error GoTo 0
+				RenderArray = RenderArray & toJSON(Eval("arr(" & parent & index & ")")) & limiter
+			Else
+				RenderArray = RenderArray & rendered & "" & limiter
+			End If
+		Next
+		RenderArray = RenderArray & "]"
+	End Function
+
+	Public Property Get jsString
+		jsString = toJSON(Me)
+	End Property
+
+	Sub Flush
+		If TypeName(Response) <> "Empty" Then 
+			Response.Write(jsString)
+		ElseIf WScript <> Empty Then 
+			WScript.Echo(jsString)
+		End If
+	End Sub
+
+	Public Function Clone
+		Set Clone = ColClone(Me)
+	End Function
+
+	Private Function ColClone(core)
+		Dim jsc, i
+		Set jsc = new jsCore
+		jsc.Kind = core.Kind
+		For Each i In core.Collection
+			If IsObject(core(i)) Then
+				Set jsc(i) = ColClone(core(i))
+			Else
+				jsc(i) = core(i)
+			End If
+		Next
+		Set ColClone = jsc
+	End Function
+
+End Class
+
+Function jsObject
+	Set jsObject = new jsCore
+	jsObject.Kind = JSON_OBJECT
+End Function
+
+Function jsArray
+	Set jsArray = new jsCore
+	jsArray.Kind = JSON_ARRAY
+End Function
+
+Function toJSON(val)
+	toJSON = (new jsCore).toJSON(val)
+End Function
+%>
\ No newline at end of file
diff --git a/public/kindeditor/asp/UpLoad_Class.asp b/public/kindeditor/asp/UpLoad_Class.asp
new file mode 100644
index 0000000..476f6f9
--- /dev/null
+++ b/public/kindeditor/asp/UpLoad_Class.asp
@@ -0,0 +1,561 @@
+<%
+'=========================================================
+ '类名: AnUpLoad(艾恩无组件上传类)
+ '作者: Anlige
+ '版本: 艾恩ASP无组件上传类V11.03.25
+ '开发日期: 2008-4-12
+ '修改日期: 2011-03025
+ '主页: http://dev.mo.cn
+ 'Email: zhanghuiguoanlige@126.com
+ 'QQ: 1034555083
+'=========================================================
+Dim StreamT
+Class AnUpLoad
+	Private Form, Fils
+	Private vCharSet, vMaxSize, vSingleSize, vErr, vVersion, vTotalSize, vExe, pID, vOP, vErrExe,vboundary, vLostTime, vMode, vFileCount
+	
+	'==============================
+	'设置和读取属性开始
+	'==============================
+	Public Property Let Mode(ByVal value)
+		vMode = value
+	End Property
+	
+	Public Property Let MaxSize(ByVal value)
+		vMaxSize = value
+	End Property
+	
+	Public Property Let SingleSize(ByVal value)
+		vSingleSize = value
+	End Property
+	
+	Public Property Let Exe(ByVal value)
+		vExe = LCase(value)
+	End Property
+	
+	Public Property Let CharSet(ByVal value)
+		vCharSet = value
+	End Property
+	
+	Public Property Get ErrorID()
+		ErrorID = vErr
+	End Property
+	
+	Public Property Get FileCount()
+		FileCount = Fils.count
+	End Property
+	
+	Public Property Get Description()
+		Description = GetErr(vErr)
+	End Property
+	
+	Public Property Get Version()
+		Version = vVersion
+	End Property
+	
+	Public Property Get TotalSize()
+		TotalSize = vTotalSize
+	End Property
+	
+	Public Property Get ProcessID()
+		ProcessID = pID
+	End Property
+	
+	Public Property Let openProcesser(ByVal value)
+		vOP = value
+	End Property
+	
+	Public Property Get LostTime()
+		LostTime = vLostTime
+	End Property
+	'==============================
+	'设置和读取属性结束，初始化类
+	'==============================
+	
+	Private Sub Class_Initialize()
+		set Form = server.createobject("Scripting.Dictionary")
+		set Fils = server.createobject("Scripting.Dictionary")
+		Set StreamT = server.CreateObject("Adodb.stream")
+		vVersion = "艾恩ASP无组件上传类V10.10.22"
+		vMaxSize = -1
+		vSingleSize = -1
+		vErr = -1
+		vExe = ""
+		vTotalSize = 0
+		vCharSet = "utf-8"
+		vOP=false
+		pID="AnUpload"
+		setApp "",0,0,""
+		vMode = 0
+	End Sub
+	
+	Private Sub Class_Terminate()
+		Dim f
+		Form.RemoveAll()
+		For each f in Fils 
+			Fils(f).value=empty
+			Set Fils(f) = Nothing
+		Next
+		Fils.RemoveAll()
+		Set Form = Nothing
+		Set Fils = Nothing
+		StreamT.Close()
+		Set StreamT = Nothing
+	End Sub
+	
+	'==============================
+	'函数名:GetData
+	'作用:处理客户端提交来的所有数据
+	'==============================
+	Public Sub GetData()
+		Dim time1
+		time1 = timer()
+		if vOP And trim(request.querystring("processid"))<>"" then pID=request.querystring("processid")
+		Dim value, str, bcrlf, fpos, sSplit, slen, istart,ef
+		Dim TotalBytes,tempdata,BytesRead,ChunkReadSize,PartSize,DataPart,formend, formhead, startpos, endpos, formname, FileName, fileExe, valueend, NewName,localname,type_1,contentType
+		TotalBytes = Request.TotalBytes
+		ef = false
+		If checkEntryType = false Then ef = true : vErr = 2
+		'下面3句注释掉了，因为在IIS5.0中，如果上传大小大于限制大小的文件，会出错，一直没找到解决方法。如果是在IIS5以上的版本使用，可以取消下面3句的注释
+		'If Not ef Then
+			'If vMaxSize > 0 And TotalBytes > vMaxSize Then ef = true : vErr = 1
+		'End If
+		If ef Then Exit Sub
+		If vMode = 0 Then
+			vTotalSize = 0 
+			StreamT.Type = 1
+			StreamT.Mode = 3
+			StreamT.Open
+			BytesRead = 0
+			ChunkReadSize = 1024 * 16
+			Do While BytesRead < TotalBytes
+				PartSize = ChunkReadSize
+				If PartSize + BytesRead > TotalBytes Then PartSize = TotalBytes - BytesRead
+				DataPart = Request.BinaryRead(PartSize)
+				StreamT.Write DataPart
+				BytesRead = BytesRead + PartSize
+				setApp "uploading",TotalBytes,BytesRead,""
+			Loop
+			setApp "uploaded",TotalBytes,BytesRead,""
+			StreamT.Position = 0
+			tempdata = StreamT.Read
+		Else
+			tempdata = Request.BinaryRead(TotalBytes)
+		End If
+		bcrlf = ChrB(13) & ChrB(10)
+		fpos = InStrB(1, tempdata, bcrlf)
+        sSplit = MidB(tempdata, 1, fpos - 1)
+		slen = LenB(sSplit)
+		istart = slen + 2
+        Do
+            formend = InStrB(istart, tempdata, bcrlf & bcrlf)
+            formhead = MidB(tempdata, istart, formend - istart)
+            str = Bytes2Str(formhead)
+            startpos = InStr(str, "name=""") + 6
+            endpos = InStr(startpos, str, """")
+            formname = LCase(Mid(str, startpos, endpos - startpos))
+            valueend = InStrB(formend + 3, tempdata, sSplit)
+			If InStr(str, "filename=""") > 0 Then
+				startpos = InStr(str, "filename=""") + 10
+				endpos = InStr(startpos, str, """")
+				type_1=instr(endpos,lcase(str),"content-type")
+				contentType=trim(mid(str,type_1+13))
+				FileName = Mid(str, startpos, endpos - startpos)
+				If Trim(FileName) <> "" Then
+					LocalName = FileName
+					FileName = Replace(FileName, "/", "\")
+					FileName = Mid(FileName, InStrRev(FileName, "\") + 1)
+					If instr(FileName,".")>0 Then
+						fileExe = Split(FileName, ".")(UBound(Split(FileName, ".")))
+					else
+						fileExe = ""
+					End If
+					If vExe <> "" Then '判断扩展名
+						If checkExe(fileExe) = True Then
+							vErr = 3
+							vErrExe = fileExe
+							tempdata = empty
+							Exit Sub
+						End If
+					End If
+					NewName = Getname()
+					NewName = NewName & "." & fileExe
+					vTotalSize = vTotalSize + valueend - formend - 6
+					If vSingleSize > 0 And (valueend - formend - 6) > vSingleSize Then '判断上传单个文件大小
+						vErr = 5
+						tempdata = empty
+						Exit Sub
+					End If
+					If vMaxSize > 0 And vTotalSize > vMaxSize Then '判断上传数据总大小
+						vErr = 1
+						tempdata = empty
+						Exit Sub
+					End If
+					If Fils.Exists(formname) Then
+						vErr = 4
+						tempdata = empty
+						Exit Sub
+					Else
+						Dim fileCls:set fileCls= new UploadFileEx
+						fileCls.ContentType=contentType
+						fileCls.Size = (valueend - formend - 6)
+						fileCls.Position = (formend + 3)
+						fileCls.FormName = formname
+						fileCls.NewName = NewName
+						fileCls.FileName = FileName
+						fileCls.LocalName = FileName
+						fileCls.extend=split(NewName,".")(ubound(split(NewName,".")))
+						Fils.Add formname, fileCls
+						Set fileCls = Nothing
+					End If
+				End If
+			Else
+				value = MidB(tempdata, formend + 4, valueend - formend - 6)
+				If Form.Exists(formname) Then
+					Form(formname) = Form(formname) & "," & Bytes2Str(value)
+				Else
+					Form.Add formname, Bytes2Str(value)
+				End If
+			End If
+            istart = valueend + 2 + slen
+        Loop Until (istart + 2) >= LenB(tempdata)
+		vErr = 0
+		tempdata = empty
+		vLostTime = FormatNumber((timer-time1)*1000,2)
+	End Sub
+	
+	Public sub setApp(stp,total,current,desc)
+		Application.lock()
+		Application(pID)="{ID:""" & pID & """,step:""" & stp & """,total:" & total & ",now:" & current & ",description:""" & desc & """,dt:""" & now() & """}"
+		Application.unlock()
+	end sub
+	'==============================
+	'判断扩展名
+	'==============================
+	Private Function checkExe(ByVal ex)
+		Dim notIn: notIn = True
+		If vExe="*" then
+			notIn=false 
+		elseIf InStr(1, vExe, "|") > 0 Then
+			Dim tempExe: tempExe = Split(vExe, "|")
+			Dim I: I = 0
+			For I = 0 To UBound(tempExe)
+				If LCase(ex) = tempExe(I) Then
+					notIn = False
+					Exit For
+				End If
+			Next
+		Else
+			If vExe = LCase(ex) Then
+				notIn = False
+			End If
+		End If
+		checkExe = notIn
+	End Function
+	
+	'==============================
+	'把数字转换为文件大小显示方式
+	'==============================
+	Public Function GetSize(ByVal Size)
+		If Size < 1024 Then
+			GetSize = FormatNumber(Size, 2) & "B"
+		ElseIf Size >= 1024 And Size < 1048576 Then
+			GetSize = FormatNumber(Size / 1024, 2) & "KB"
+		ElseIf Size >= 1048576 Then
+			GetSize = FormatNumber((Size / 1024) / 1024, 2) & "MB"
+		End If
+	End Function
+	
+	'==============================
+	'二进制数据转换为字符
+	'==============================
+	Private Function Bytes2Str(ByVal byt)
+		If LenB(byt) = 0 Then
+			Bytes2Str = ""
+			Exit Function
+		End If
+		Dim mystream, bstr
+		Set mystream =server.createobject("ADODB.Stream")
+		mystream.Type = 2
+		mystream.Mode = 3
+		mystream.Open
+		mystream.WriteText byt
+		mystream.Position = 0
+		mystream.CharSet = vCharSet
+		mystream.Position = 2
+		bstr = mystream.ReadText()
+		mystream.Close
+		Set mystream = Nothing
+		Bytes2Str = bstr
+	End Function
+	
+	'==============================
+	'获取错误描述
+	'==============================
+	Private Function GetErr(ByVal Num)
+		Select Case Num
+			Case 0
+				GetErr = "数据处理完毕!"
+			Case 1
+				GetErr = "上传数据超过" & GetSize(vMaxSize) & "限制!可设置MaxSize属性来改变限制!"
+			Case 2
+				GetErr = "未设置上传表单enctype属性为multipart/form-data或者未设置method属性为Post,上传无效!"
+			Case 3
+				GetErr = "含有非法扩展名(" & vErrExe & ")文件!只能上传扩展名为" & Replace(vExe, "|", ",") & "的文件"
+			Case 4
+				GetErr = "对不起,程序不允许使用相同name属性的文件域!"
+			Case 5
+				GetErr = "单个文件大小超出" & GetSize(vSingleSize) & "的上传限制!"
+		End Select
+	End Function
+	
+	'==============================
+	'根据日期生成随机文件名
+	'==============================
+	Private Function Getname()
+		Dim y, m, d, h, mm, S, r
+		Randomize
+		y = Year(Now)
+		m = right("0" & Month(Now),2)
+		d = right("0" & Day(Now),2)
+		h = right("0" & Hour(Now),2)
+		mm =right("0" & Minute(Now),2)
+		S = right("0" & Second(Now),2)
+		r = 0
+		r = CInt(Rnd() * 10000)
+		S = right("0000" & r,4)
+		Getname = y & m & d & h & mm & S & r
+	End Function
+	
+	'==============================
+	'检测上传类型是否为multipart/form-data
+	'==============================
+	Private Function checkEntryType()
+		Dim ContentType, ctArray, bArray,RequestMethod
+		RequestMethod=trim(LCase(Request.ServerVariables("REQUEST_METHOD")))
+		if RequestMethod="" or RequestMethod<>"post" then
+			checkEntryType = False
+			exit function
+		end if
+		ContentType = LCase(Request.ServerVariables("HTTP_CONTENT_TYPE"))
+		ctArray = Split(ContentType, ";")
+		if ubound(ctarray)>=0 then
+			If Trim(ctArray(0)) = "multipart/form-data" Then
+			checkEntryType = True
+			vboundary = Split(ContentType,"boundary=")(1)
+			Else
+			checkEntryType = False
+			End If
+		else
+			checkEntryType = False
+		end if
+	End Function
+	
+	'==============================
+	'获取上传表单值,参数可选,如果为-1则返回一个包含所有表单项的一个dictionary对象
+	'==============================
+	Public Function Forms(ByVal formname)
+		If trim(formname) = "-1" Then
+			Set Forms = Form
+		Else
+			If Form.Exists(LCase(formname)) Then
+				Forms = Form(LCase(formname))
+			Else
+				Forms = ""
+			End If
+		End If
+	End Function
+	
+	'==============================
+	'获取上传的文件类,参数可选,如果为-1则返回一个包含所有上传文件类的一个dictionary对象
+	'==============================
+	Public Function Files(ByVal formname)
+		If trim(formname) = "-1" Then
+			Set Files = Fils
+		Else
+			If Fils.Exists(LCase(formname)) Then
+				Set Files = Fils(LCase(formname))
+			Else
+				Set Files = Nothing
+			End If
+		End If
+	End Function
+End Class
+
+Class UploadFileEx
+	Private mvarFormName , mvarNewName , mvarLocalName , mvarFileName , mvarUserSetName , mvarContentType ,mException,mvarPosition
+	Private mvarSize , mvarValue , mvarPath , mvarExtend ,mvarWidth, mvarHeight
+	
+	Public Property Let Extend(ByVal vData )
+		mvarExtend = vData
+	End Property
+	Public Property Get Extend() 
+		Extend = mvarExtend
+	End Property
+
+	Public Property Get Width() 
+		Width = mvarWidth
+	End Property
+	
+	Public Property Get Height() 
+		Height = mvarHeight
+	End Property
+	
+		
+	Public Property Let Path(ByVal vData )
+		mvarPath = vData
+	End Property
+	Public Property Get Path() 
+		Path = mvarPath
+	End Property
+	
+	Public Property Get Exception() 
+		Exception = mException
+	End Property
+	
+	Public Property Let Value(ByVal vData )
+		mvarValue = vData
+	End Property
+	
+	Public Property Get Value() 
+		Value = mvarValue
+	End Property
+	
+	Public Property Let Size(ByVal vData )
+		mvarSize = vData
+	End Property
+	Public Property Get Size() 
+		Size = mvarSize
+	End Property
+
+	Public Property Let Position(ByVal vData )
+		mvarPosition = vData
+	End Property
+	Public Property Get Position() 
+		Size = mvarPosition
+	End Property
+		
+	Public Property Let ContentType(ByVal vData )
+		mvarContentType = vData
+	End Property
+	Public Property Get ContentType() 
+		ContentType = mvarContentType
+	End Property
+	
+	Public Property Let UserSetName(ByVal vData )
+		mvarUserSetName = vData
+	End Property
+	Public Property Get UserSetName() 
+		UserSetName = mvarUserSetName
+	End Property
+	
+	Public Property Let FileName(ByVal vData )
+		mvarFileName = vData
+	End Property
+	Public Property Get FileName() 
+		FileName = mvarFileName
+	End Property
+	
+	Public Property Let LocalName(ByVal vData )
+		mvarLocalName = vData
+	End Property
+	Public Property Get LocalName() 
+		LocalName = mvarLocalName
+	End Property
+	
+	Public Property Let NewName(ByVal vData )
+		mvarNewName = vData
+	End Property
+	Public Property Get NewName() 
+		NewName = mvarNewName
+	End Property
+	
+	Public Property Let FormName(ByVal vData )
+		mvarFormName = vData
+	End Property
+	Public Property Get FormName() 
+		FormName = mvarFormName
+	End Property
+	
+	Private Sub Class_Initialize()
+		mvarSize =0
+		mvarWidth = 0
+		mvarHeight = 0
+	End Sub
+	
+	Public Function SaveToFile(ByVal Path , byval tOption, byval OverWrite)
+		On Error Resume Next
+		Dim IsP 
+		IsP = (InStr(Path, ":") = 2)
+		If Not IsP Then Path = Server.MapPath(Path)
+		Path = Replace(Path, "/", "\")
+		If Mid(Path, Len(Path) - 1) <> "\" Then Path = Path + "\"
+		CreateFolder Path
+		mvarPath = Path
+		If tOption = 1 Then
+			Path = Path & mvarLocalName: mvarFileName = mvarLocalName
+		Else
+			If tOption = -1 And mvarUserSetName <> "" Then
+				Path = Path & mvarUserSetName & "." & mvarExtend: mvarFileName = mvarUserSetName & "." & mvarExtend
+			Else
+				Path = Path & mvarNewName: mvarFileName = mvarNewName
+			End If
+		End If
+		If Not OverWrite Then
+			Path = GetFilePath()
+		End If
+		Dim tmpStrm
+		Set tmpStrm =server.CreateObject("ADODB.Stream")
+		tmpStrm.Mode = 3
+		tmpStrm.Type = 1
+		tmpStrm.Open
+		StreamT.Position = mvarPosition
+		StreamT.copyto tmpStrm,mvarSize
+		tmpStrm.SaveToFile Path, 2
+		tmpStrm.Close
+		Set tmpStrm = Nothing
+		If Not Err Then
+			Set SaveToFile = objFromJson("{error:false}")
+		Else
+			Set SaveToFile = objFromJson("{error:true,description:'" & replace(Err.Description,"'","\'") & "'}")
+			mException=Err.Description
+		End If
+	End Function
+	
+	Public Function GetBytes()
+		StreamT.Position = mvarPosition
+		GetBytes = StreamT.read(mvarSize)
+	End Function
+	Private Function CreateFolder(ByVal folderPath )
+		Dim oFSO
+		Set oFSO = server.CreateObject("Scripting.FileSystemObject")
+		Dim sParent 
+		sParent = oFSO.GetParentFolderName(folderPath)
+		If sParent = "" Then Exit Function
+		If Not oFSO.FolderExists(sParent) Then CreateFolder (sParent)
+		If Not oFSO.FolderExists(folderPath) Then oFSO.CreateFolder (folderPath)
+		Set oFSO = Nothing
+	End Function
+	
+	Private Function GetFilePath() 
+		Dim oFSO, Fname , FNameL , i 
+		i = 0
+		Set oFSO = server.CreateObject("Scripting.FileSystemObject")
+		Fname = mvarPath & mvarFileName
+		FNameL = Mid(mvarFileName, 1, InStr(mvarFileName, ".") - 1)
+		Do While oFSO.FileExists(Fname)
+			Fname = mvarPath & FNameL & "(" & i & ")." & mvarExtend
+			mvarFileName = FNameL & "(" & i & ")." & mvarExtend
+			i = i + 1
+		Loop
+		Set oFSO = Nothing
+		GetFilePath = Fname
+	End Function
+End Class
+%>
+<script language="jscript" runat="server">
+	function objFromJson(str){
+		eval("var _temp=(" + str + ");");
+		return _temp;
+	}
+</script>
\ No newline at end of file
diff --git a/public/kindeditor/asp/demo.asp b/public/kindeditor/asp/demo.asp
new file mode 100644
index 0000000..1f84c4c
--- /dev/null
+++ b/public/kindeditor/asp/demo.asp
@@ -0,0 +1,60 @@
+<%@ CODEPAGE=65001 %>
+<%
+Option Explicit
+Response.CodePage=65001
+Response.Charset="UTF-8"
+
+Dim htmlData
+
+htmlData = Request.Form("content1")
+
+Function htmlspecialchars(str)
+	str = Replace(str, "&", "&amp;")
+	str = Replace(str, "<", "&lt;")
+	str = Replace(str, ">", "&gt;")
+	str = Replace(str, """", "&quot;")
+	htmlspecialchars = str
+End Function
+%>
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title>KindEditor ASP</title>
+	<link rel="stylesheet" href="../themes/default/default.css" />
+	<link rel="stylesheet" href="../plugins/code/prettify.css" />
+	<script charset="utf-8" src="../kindeditor.js"></script>
+	<script charset="utf-8" src="../lang/zh-CN.js"></script>
+	<script charset="utf-8" src="../plugins/code/prettify.js"></script>
+	<script>
+		KindEditor.ready(function(K) {
+			var editor1 = K.create('textarea[name="content1"]', {
+				cssPath : '../plugins/code/prettify.css',
+				uploadJson : '../asp/upload_json.asp',
+				fileManagerJson : '../asp/file_manager_json.asp',
+				allowFileManager : true,
+				afterCreate : function() {
+					var self = this;
+					K.ctrl(document, 13, function() {
+						self.sync();
+						K('form[name=example]')[0].submit();
+					});
+					K.ctrl(self.edit.doc, 13, function() {
+						self.sync();
+						K('form[name=example]')[0].submit();
+					});
+				}
+			});
+			prettyPrint();
+		});
+	</script>
+</head>
+<body>
+	<%=htmlData%>
+	<form name="example" method="post" action="demo.asp">
+		<textarea name="content1" style="width:700px;height:200px;visibility:hidden;"><%=htmlspecialchars(htmlData)%></textarea>
+		<br />
+		<input type="submit" name="button" value="提交内容" /> (提交快捷键: Ctrl + Enter)
+	</form>
+</body>
+</html>
diff --git a/public/kindeditor/asp/file_manager_json.asp b/public/kindeditor/asp/file_manager_json.asp
new file mode 100644
index 0000000..1f1ce51
--- /dev/null
+++ b/public/kindeditor/asp/file_manager_json.asp
@@ -0,0 +1,228 @@
+<%@ CODEPAGE=65001 %>
+<% Option Explicit %>
+<% Response.CodePage=65001 %>
+<% Response.Charset="UTF-8" %>
+<!--#include file="JSON_2.0.4.asp"-->
+<%
+
+' KindEditor ASP
+'
+' 本ASP程序是演示程序，建议不要直接在实际项目中使用。
+' 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+'
+
+Dim aspUrl, rootPath, rootUrl, fileTypes
+Dim currentPath, currentUrl, currentDirPath, moveupDirPath
+Dim path, order, dirName, fso, folder, dir, file, result
+Dim fileExt, dirCount, fileCount, orderIndex, i, j
+Dim dirList(), fileList(), isDir, hasFile, filesize, isPhoto, filetype, filename, datetime
+
+aspUrl = Request.ServerVariables("SCRIPT_NAME")
+aspUrl = left(aspUrl, InStrRev(aspUrl, "/"))
+
+'根目录路径，可以指定绝对路径，比如 /var/www/attached/
+rootPath = "../attached/"
+'根目录URL，可以指定绝对路径，比如 http://www.yoursite.com/attached/
+rootUrl = aspUrl & "../attached/"
+'图片扩展名
+fileTypes = "gif,jpg,jpeg,png,bmp"
+
+currentPath = ""
+currentUrl = ""
+currentDirPath = ""
+moveupDirPath = ""
+
+Set fso = Server.CreateObject("Scripting.FileSystemObject")
+
+'目录名
+dirName = Request.QueryString("dir")
+If Not isEmpty(dirName) Then
+	If instr(lcase("image,flash,media,file"), dirName) < 1 Then
+		Response.Write "Invalid Directory name."
+		Response.End
+	End If
+	rootPath = rootPath & dirName & "/"
+	rootUrl = rootUrl & dirName & "/"
+	If Not fso.FolderExists(Server.mappath(rootPath)) Then
+		fso.CreateFolder(Server.mappath(rootPath))
+	End If
+End If
+
+'根据path参数，设置各路径和URL
+path = Request.QueryString("path")
+If path = "" Then
+	currentPath = Server.MapPath(rootPath) & "\"
+	currentUrl = rootUrl
+	currentDirPath = ""
+	moveupDirPath = ""
+Else
+	currentPath = Server.MapPath(rootPath & path) & "\"
+	currentUrl = rootUrl + path
+	currentDirPath = path
+	moveupDirPath = RegexReplace(currentDirPath, "(.*?)[^\/]+\/$", "$1")
+End If
+
+Set folder = fso.GetFolder(currentPath)
+
+'排序形式，name or size or type
+order = lcase(Request.QueryString("order"))
+Select Case order
+	Case "type" orderIndex = 4
+	Case "size" orderIndex = 2
+	Case Else  orderIndex = 5
+End Select
+
+'不允许使用..移动到上一级目录
+If RegexIsMatch(path, "\.\.") Then
+	Response.Write "Access is not allowed."
+	Response.End
+End If
+'最后一个字符不是/
+If path <> "" And Not RegexIsMatch(path, "\/$") Then
+	Response.Write "Parameter is not allowed."
+	Response.End
+End If
+'目录不存在或不是目录
+If Not DirectoryExists(currentPath) Then
+	Response.Write "Directory does not exist."
+	Response.End
+End If
+
+Set result = jsObject()
+'相对于根目录的上一级目录
+result("moveup_dir_path") = moveupDirPath
+'相对于根目录的当前目录
+result("current_dir_path") = currentDirPath
+'当前目录的URL
+result("current_url") = currentUrl
+
+'文件数
+dirCount = folder.SubFolders.count
+fileCount = folder.Files.count
+result("total_count") = dirCount + fileCount
+
+ReDim dirList(dirCount)
+i = 0
+For Each dir in folder.SubFolders
+	isDir = True
+	hasFile = (dir.Files.count > 0)
+	filesize = 0
+	isPhoto = False
+	filetype = ""
+	filename = dir.name
+	datetime = FormatDate(dir.DateLastModified)
+	dirList(i) = Array(isDir, hasFile, filesize, isPhoto, filetype, filename, datetime)
+	i = i + 1
+Next
+ReDim fileList(fileCount)
+i = 0
+For Each file in folder.Files
+	fileExt = lcase(mid(file.name, InStrRev(file.name, ".") + 1))
+	isDir = False
+	hasFile = False
+	filesize = file.size
+	isPhoto = (instr(lcase(fileTypes), fileExt) > 0)
+	filetype = fileExt
+	filename = file.name
+	datetime = FormatDate(file.DateLastModified)
+	fileList(i) = Array(isDir, hasFile, filesize, isPhoto, filetype, filename, datetime)
+	i = i + 1
+Next
+
+'排序
+Dim minidx, temp
+For i = 0 To dirCount - 2
+	minidx = i
+	For j = i + 1 To dirCount - 1
+		If (dirList(minidx)(5) > dirList(j)(5)) Then
+			minidx = j
+		End If
+	Next
+	If minidx <> i Then
+		temp = dirList(minidx)
+		dirList(minidx) = dirList(i)
+		dirList(i) = temp
+	End If
+Next
+For i = 0 To fileCount - 2
+	minidx = i
+	For j = i + 1 To fileCount - 1
+		If (fileList(minidx)(orderIndex) > fileList(j)(orderIndex)) Then
+			minidx = j
+		End If
+	Next
+	If minidx <> i Then
+		temp = fileList(minidx)
+		fileList(minidx) = fileList(i)
+		fileList(i) = temp
+	End If
+Next
+
+Set result("file_list") = jsArray()
+For i = 0 To dirCount - 1
+	Set result("file_list")(Null) = jsObject()
+	result("file_list")(Null)("is_dir") = dirList(i)(0)
+	result("file_list")(Null)("has_file") = dirList(i)(1)
+	result("file_list")(Null)("filesize") = dirList(i)(2)
+	result("file_list")(Null)("is_photo") = dirList(i)(3)
+	result("file_list")(Null)("filetype") = dirList(i)(4)
+	result("file_list")(Null)("filename") = dirList(i)(5)
+	result("file_list")(Null)("datetime") = dirList(i)(6)
+Next
+For i = 0 To fileCount - 1
+	Set result("file_list")(Null) = jsObject()
+	result("file_list")(Null)("is_dir") = fileList(i)(0)
+	result("file_list")(Null)("has_file") = fileList(i)(1)
+	result("file_list")(Null)("filesize") = fileList(i)(2)
+	result("file_list")(Null)("is_photo") = fileList(i)(3)
+	result("file_list")(Null)("filetype") = fileList(i)(4)
+	result("file_list")(Null)("filename") = fileList(i)(5)
+	result("file_list")(Null)("datetime") = fileList(i)(6)
+Next
+
+'输出JSON字符串
+Response.AddHeader "Content-Type", "text/html; charset=UTF-8"
+result.Flush
+Response.End
+
+'自定义函数
+Function DirectoryExists(dirPath)
+	Dim fso
+	Set fso = Server.CreateObject("Scripting.FileSystemObject")
+	DirectoryExists = fso.FolderExists(dirPath)
+End Function
+
+Function RegexIsMatch(subject, pattern)
+	Dim reg
+	Set reg = New RegExp
+	reg.Global = True
+	reg.MultiLine = True
+	reg.Pattern = pattern
+	RegexIsMatch = reg.Test(subject)
+End Function
+
+Function RegexReplace(subject, pattern, replacement)
+	Dim reg
+	Set reg = New RegExp
+	reg.Global = True
+	reg.MultiLine = True
+	reg.Pattern = pattern
+	RegexReplace = reg.Replace(subject, replacement)
+End Function
+
+Public Function FormatDate(datetime)
+	Dim y, m, d, h, i, s
+	y = CStr(Year(datetime))
+	m = CStr(Month(datetime))
+	If Len(m) = 1 Then m = "0" & m
+	d = CStr(Day(datetime))
+	If Len(d) = 1 Then d = "0" & d
+	h = CStr(Hour(datetime))
+	If Len(h) = 1 Then h = "0" & h
+	i = CStr(Minute(datetime))
+	If Len(i) = 1 Then i = "0" & i
+	s = CStr(Second(datetime))
+	If Len(s) = 1 Then s = "0" & s
+	FormatDate = y & "-" & m & "-" & d & " " & h & ":" & i & ":" & s
+End Function
+%>
diff --git a/public/kindeditor/asp/upload_json.asp b/public/kindeditor/asp/upload_json.asp
new file mode 100644
index 0000000..209f107
--- /dev/null
+++ b/public/kindeditor/asp/upload_json.asp
@@ -0,0 +1,119 @@
+<%@ CODEPAGE=65001 %>
+<% Option Explicit %>
+<% Response.CodePage=65001 %>
+<% Response.Charset="UTF-8" %>
+<!--#include file="UpLoad_Class.asp"-->
+<!--#include file="JSON_2.0.4.asp"-->
+<%
+
+' KindEditor ASP
+'
+' 本ASP程序是演示程序，建议不要直接在实际项目中使用。
+' 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+'
+
+Dim aspUrl, savePath, saveUrl, maxSize, fileName, fileExt, newFileName, filePath, fileUrl, dirName
+Dim extStr, imageExtStr, flashExtStr, mediaExtStr, fileExtStr
+Dim upload, file, fso, ranNum, hash, ymd, mm, dd, result
+
+aspUrl = Request.ServerVariables("SCRIPT_NAME")
+aspUrl = left(aspUrl, InStrRev(aspUrl, "/"))
+
+'文件保存目录路径
+savePath = "../attached/"
+'文件保存目录URL
+saveUrl = aspUrl & "../attached/"
+'定义允许上传的文件扩展名
+imageExtStr = "gif|jpg|jpeg|png|bmp"
+flashExtStr = "swf|flv"
+mediaExtStr = "swf|flv|mp3|wav|wma|wmv|mid|avi|mpg|asf|rm|rmvb"
+fileExtStr = "doc|docx|xls|xlsx|ppt|htm|html|txt|zip|rar|gz|bz2"
+'最大文件大小
+maxSize = 5 * 1024 * 1024 '5M
+
+Set fso = Server.CreateObject("Scripting.FileSystemObject")
+If Not fso.FolderExists(Server.mappath(savePath)) Then
+	showError("上传目录不存在。")
+End If
+
+dirName = Request.QueryString("dir")
+If isEmpty(dirName) Then
+	dirName = "image"
+End If
+If instr(lcase("image,flash,media,file"), dirName) < 1 Then
+	showError("目录名不正确。")
+End If
+
+Select Case dirName
+	Case "flash" extStr = flashExtStr
+	Case "media" extStr = mediaExtStr
+	Case "file" extStr = fileExtStr
+	Case Else  extStr = imageExtStr
+End Select
+
+set upload = new AnUpLoad
+upload.Exe = extStr
+upload.MaxSize = maxSize
+upload.GetData()
+if upload.ErrorID>0 then 
+	showError(upload.Description)
+end if
+
+'创建文件夹
+savePath = savePath & dirName & "/"
+saveUrl = saveUrl & dirName & "/"
+If Not fso.FolderExists(Server.mappath(savePath)) Then
+	fso.CreateFolder(Server.mappath(savePath))
+End If
+mm = month(now)
+If mm < 10 Then
+	mm = "0" & mm
+End If
+dd = day(now)
+If dd < 10 Then
+	dd = "0" & dd
+End If
+ymd = year(now) & mm & dd
+savePath = savePath & ymd & "/"
+saveUrl = saveUrl & ymd & "/"
+If Not fso.FolderExists(Server.mappath(savePath)) Then
+	fso.CreateFolder(Server.mappath(savePath))
+End If
+
+set file = upload.files("imgFile")
+if file is nothing then
+	showError("请选择文件。")
+end if
+
+set result = file.saveToFile(savePath, 0, true)
+if result.error then
+	showError(file.Exception)
+end if
+
+filePath = Server.mappath(savePath & file.filename)
+fileUrl = saveUrl & file.filename
+
+Set upload = nothing
+Set file = nothing
+
+If Not fso.FileExists(filePath) Then
+	showError("上传文件失败。")
+End If
+
+Response.AddHeader "Content-Type", "text/html; charset=UTF-8"
+Set hash = jsObject()
+hash("error") = 0
+hash("url") = fileUrl
+hash.Flush
+Response.End
+
+Function showError(message)
+	Response.AddHeader "Content-Type", "text/html; charset=UTF-8"
+	Dim hash
+	Set hash = jsObject()
+	hash("error") = 1
+	hash("message") = message
+	hash.Flush
+	Response.End
+End Function
+%>
diff --git a/public/kindeditor/jsp/README.txt b/public/kindeditor/jsp/README.txt
new file mode 100644
index 0000000..f59dc08
--- /dev/null
+++ b/public/kindeditor/jsp/README.txt
@@ -0,0 +1,15 @@
+KindEditor JSP
+
+本JSP程序是演示程序，建议不要直接在实际项目中使用。
+如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ 
+使用方法:
+
+1. 解压zip文件，将所有文件复制到Tomcat的webapps/kindeditor目录下。
+
+2. 将kindeditor/jsp/lib目录下的3个jar文件复制到Tomcat的lib目录下，并重新启动Tomcat。
+	* commons-fileupload-1.2.1.jar
+	* commons-io-1.4.jar
+	* json_simple-1.1.jar
+
+3. 打开浏览器，输入http://localhost:[P0RT]/kindeditor/jsp/demo.jsp。
diff --git a/public/kindeditor/jsp/demo.jsp b/public/kindeditor/jsp/demo.jsp
new file mode 100644
index 0000000..aa944f7
--- /dev/null
+++ b/public/kindeditor/jsp/demo.jsp
@@ -0,0 +1,56 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+request.setCharacterEncoding("UTF-8");
+String htmlData = request.getParameter("content1") != null ? request.getParameter("content1") : "";
+%>
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title>KindEditor JSP</title>
+	<link rel="stylesheet" href="../themes/default/default.css" />
+	<link rel="stylesheet" href="../plugins/code/prettify.css" />
+	<script charset="utf-8" src="../kindeditor.js"></script>
+	<script charset="utf-8" src="../lang/zh-CN.js"></script>
+	<script charset="utf-8" src="../plugins/code/prettify.js"></script>
+	<script>
+		KindEditor.ready(function(K) {
+			var editor1 = K.create('textarea[name="content1"]', {
+				cssPath : '../plugins/code/prettify.css',
+				uploadJson : '../jsp/upload_json.jsp',
+				fileManagerJson : '../jsp/file_manager_json.jsp',
+				allowFileManager : true,
+				afterCreate : function() {
+					var self = this;
+					K.ctrl(document, 13, function() {
+						self.sync();
+						document.forms['example'].submit();
+					});
+					K.ctrl(self.edit.doc, 13, function() {
+						self.sync();
+						document.forms['example'].submit();
+					});
+				}
+			});
+			prettyPrint();
+		});
+	</script>
+</head>
+<body>
+	<%=htmlData%>
+	<form name="example" method="post" action="demo.jsp">
+		<textarea name="content1" cols="100" rows="8" style="width:700px;height:200px;visibility:hidden;"><%=htmlspecialchars(htmlData)%></textarea>
+		<br />
+		<input type="submit" name="button" value="提交内容" /> (提交快捷键: Ctrl + Enter)
+	</form>
+</body>
+</html>
+<%!
+private String htmlspecialchars(String str) {
+	str = str.replaceAll("&", "&amp;");
+	str = str.replaceAll("<", "&lt;");
+	str = str.replaceAll(">", "&gt;");
+	str = str.replaceAll("\"", "&quot;");
+	return str;
+}
+%>
\ No newline at end of file
diff --git a/public/kindeditor/jsp/file_manager_json.jsp b/public/kindeditor/jsp/file_manager_json.jsp
new file mode 100644
index 0000000..808ada0
--- /dev/null
+++ b/public/kindeditor/jsp/file_manager_json.jsp
@@ -0,0 +1,155 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.*,java.io.*" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="org.json.simple.*" %>
+<%
+
+/**
+ * KindEditor JSP
+ *
+ * 本JSP程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ *
+ */
+
+//根目录路径，可以指定绝对路径，比如 /var/www/attached/
+String rootPath = pageContext.getServletContext().getRealPath("/") + "attached/";
+//根目录URL，可以指定绝对路径，比如 http://www.yoursite.com/attached/
+String rootUrl  = request.getContextPath() + "/attached/";
+//图片扩展名
+String[] fileTypes = new String[]{"gif", "jpg", "jpeg", "png", "bmp"};
+
+String dirName = request.getParameter("dir");
+if (dirName != null) {
+	if(!Arrays.<String>asList(new String[]{"image", "flash", "media", "file"}).contains(dirName)){
+		out.println("Invalid Directory name.");
+		return;
+	}
+	rootPath += dirName + "/";
+	rootUrl += dirName + "/";
+	File saveDirFile = new File(rootPath);
+	if (!saveDirFile.exists()) {
+		saveDirFile.mkdirs();
+	}
+}
+//根据path参数，设置各路径和URL
+String path = request.getParameter("path") != null ? request.getParameter("path") : "";
+String currentPath = rootPath + path;
+String currentUrl = rootUrl + path;
+String currentDirPath = path;
+String moveupDirPath = "";
+if (!"".equals(path)) {
+	String str = currentDirPath.substring(0, currentDirPath.length() - 1);
+	moveupDirPath = str.lastIndexOf("/") >= 0 ? str.substring(0, str.lastIndexOf("/") + 1) : "";
+}
+
+//排序形式，name or size or type
+String order = request.getParameter("order") != null ? request.getParameter("order").toLowerCase() : "name";
+
+//不允许使用..移动到上一级目录
+if (path.indexOf("..") >= 0) {
+	out.println("Access is not allowed.");
+	return;
+}
+//最后一个字符不是/
+if (!"".equals(path) && !path.endsWith("/")) {
+	out.println("Parameter is not valid.");
+	return;
+}
+//目录不存在或不是目录
+File currentPathFile = new File(currentPath);
+if(!currentPathFile.isDirectory()){
+	out.println("Directory does not exist.");
+	return;
+}
+
+//遍历目录取的文件信息
+List<Hashtable> fileList = new ArrayList<Hashtable>();
+if(currentPathFile.listFiles() != null) {
+	for (File file : currentPathFile.listFiles()) {
+		Hashtable<String, Object> hash = new Hashtable<String, Object>();
+		String fileName = file.getName();
+		if(file.isDirectory()) {
+			hash.put("is_dir", true);
+			hash.put("has_file", (file.listFiles() != null));
+			hash.put("filesize", 0L);
+			hash.put("is_photo", false);
+			hash.put("filetype", "");
+		} else if(file.isFile()){
+			String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+			hash.put("is_dir", false);
+			hash.put("has_file", false);
+			hash.put("filesize", file.length());
+			hash.put("is_photo", Arrays.<String>asList(fileTypes).contains(fileExt));
+			hash.put("filetype", fileExt);
+		}
+		hash.put("filename", fileName);
+		hash.put("datetime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(file.lastModified()));
+		fileList.add(hash);
+	}
+}
+
+if ("size".equals(order)) {
+	Collections.sort(fileList, new SizeComparator());
+} else if ("type".equals(order)) {
+	Collections.sort(fileList, new TypeComparator());
+} else {
+	Collections.sort(fileList, new NameComparator());
+}
+JSONObject result = new JSONObject();
+result.put("moveup_dir_path", moveupDirPath);
+result.put("current_dir_path", currentDirPath);
+result.put("current_url", currentUrl);
+result.put("total_count", fileList.size());
+result.put("file_list", fileList);
+
+response.setContentType("application/json; charset=UTF-8");
+out.println(result.toJSONString());
+%>
+<%!
+public class NameComparator implements Comparator {
+	public int compare(Object a, Object b) {
+		Hashtable hashA = (Hashtable)a;
+		Hashtable hashB = (Hashtable)b;
+		if (((Boolean)hashA.get("is_dir")) && !((Boolean)hashB.get("is_dir"))) {
+			return -1;
+		} else if (!((Boolean)hashA.get("is_dir")) && ((Boolean)hashB.get("is_dir"))) {
+			return 1;
+		} else {
+			return ((String)hashA.get("filename")).compareTo((String)hashB.get("filename"));
+		}
+	}
+}
+public class SizeComparator implements Comparator {
+	public int compare(Object a, Object b) {
+		Hashtable hashA = (Hashtable)a;
+		Hashtable hashB = (Hashtable)b;
+		if (((Boolean)hashA.get("is_dir")) && !((Boolean)hashB.get("is_dir"))) {
+			return -1;
+		} else if (!((Boolean)hashA.get("is_dir")) && ((Boolean)hashB.get("is_dir"))) {
+			return 1;
+		} else {
+			if (((Long)hashA.get("filesize")) > ((Long)hashB.get("filesize"))) {
+				return 1;
+			} else if (((Long)hashA.get("filesize")) < ((Long)hashB.get("filesize"))) {
+				return -1;
+			} else {
+				return 0;
+			}
+		}
+	}
+}
+public class TypeComparator implements Comparator {
+	public int compare(Object a, Object b) {
+		Hashtable hashA = (Hashtable)a;
+		Hashtable hashB = (Hashtable)b;
+		if (((Boolean)hashA.get("is_dir")) && !((Boolean)hashB.get("is_dir"))) {
+			return -1;
+		} else if (!((Boolean)hashA.get("is_dir")) && ((Boolean)hashB.get("is_dir"))) {
+			return 1;
+		} else {
+			return ((String)hashA.get("filetype")).compareTo((String)hashB.get("filetype"));
+		}
+	}
+}
+%>
\ No newline at end of file
diff --git a/public/kindeditor/jsp/lib/commons-fileupload-1.2.1.jar b/public/kindeditor/jsp/lib/commons-fileupload-1.2.1.jar
new file mode 100644
index 0000000..aa209b3
Binary files /dev/null and b/public/kindeditor/jsp/lib/commons-fileupload-1.2.1.jar differ
diff --git a/public/kindeditor/jsp/lib/commons-io-1.4.jar b/public/kindeditor/jsp/lib/commons-io-1.4.jar
new file mode 100644
index 0000000..133dc6c
Binary files /dev/null and b/public/kindeditor/jsp/lib/commons-io-1.4.jar differ
diff --git a/public/kindeditor/jsp/lib/json_simple-1.1.jar b/public/kindeditor/jsp/lib/json_simple-1.1.jar
new file mode 100644
index 0000000..f395f41
Binary files /dev/null and b/public/kindeditor/jsp/lib/json_simple-1.1.jar differ
diff --git a/public/kindeditor/jsp/upload_json.jsp b/public/kindeditor/jsp/upload_json.jsp
new file mode 100644
index 0000000..559e6cd
--- /dev/null
+++ b/public/kindeditor/jsp/upload_json.jsp
@@ -0,0 +1,122 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.*,java.io.*" %>
+<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page import="org.apache.commons.fileupload.*" %>
+<%@ page import="org.apache.commons.fileupload.disk.*" %>
+<%@ page import="org.apache.commons.fileupload.servlet.*" %>
+<%@ page import="org.json.simple.*" %>
+<%
+
+/**
+ * KindEditor JSP
+ * 
+ * 本JSP程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ * 
+ */
+
+//文件保存目录路径
+String savePath = pageContext.getServletContext().getRealPath("/") + "attached/";
+
+//文件保存目录URL
+String saveUrl  = request.getContextPath() + "/attached/";
+
+//定义允许上传的文件扩展名
+HashMap<String, String> extMap = new HashMap<String, String>();
+extMap.put("image", "gif,jpg,jpeg,png,bmp");
+extMap.put("flash", "swf,flv");
+extMap.put("media", "swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb");
+extMap.put("file", "doc,docx,xls,xlsx,ppt,htm,html,txt,zip,rar,gz,bz2");
+
+//最大文件大小
+long maxSize = 1000000;
+
+response.setContentType("text/html; charset=UTF-8");
+
+if(!ServletFileUpload.isMultipartContent(request)){
+	out.println(getError("请选择文件。"));
+	return;
+}
+//检查目录
+File uploadDir = new File(savePath);
+if(!uploadDir.isDirectory()){
+	out.println(getError("上传目录不存在。"));
+	return;
+}
+//检查目录写权限
+if(!uploadDir.canWrite()){
+	out.println(getError("上传目录没有写权限。"));
+	return;
+}
+
+String dirName = request.getParameter("dir");
+if (dirName == null) {
+	dirName = "image";
+}
+if(!extMap.containsKey(dirName)){
+	out.println(getError("目录名不正确。"));
+	return;
+}
+//创建文件夹
+savePath += dirName + "/";
+saveUrl += dirName + "/";
+File saveDirFile = new File(savePath);
+if (!saveDirFile.exists()) {
+	saveDirFile.mkdirs();
+}
+SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+String ymd = sdf.format(new Date());
+savePath += ymd + "/";
+saveUrl += ymd + "/";
+File dirFile = new File(savePath);
+if (!dirFile.exists()) {
+	dirFile.mkdirs();
+}
+
+FileItemFactory factory = new DiskFileItemFactory();
+ServletFileUpload upload = new ServletFileUpload(factory);
+upload.setHeaderEncoding("UTF-8");
+List items = upload.parseRequest(request);
+Iterator itr = items.iterator();
+while (itr.hasNext()) {
+	FileItem item = (FileItem) itr.next();
+	String fileName = item.getName();
+	long fileSize = item.getSize();
+	if (!item.isFormField()) {
+		//检查文件大小
+		if(item.getSize() > maxSize){
+			out.println(getError("上传文件大小超过限制。"));
+			return;
+		}
+		//检查扩展名
+		String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
+		if(!Arrays.<String>asList(extMap.get(dirName).split(",")).contains(fileExt)){
+			out.println(getError("上传文件扩展名是不允许的扩展名。\n只允许" + extMap.get(dirName) + "格式。"));
+			return;
+		}
+
+		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+		String newFileName = df.format(new Date()) + "_" + new Random().nextInt(1000) + "." + fileExt;
+		try{
+			File uploadedFile = new File(savePath, newFileName);
+			item.write(uploadedFile);
+		}catch(Exception e){
+			out.println(getError("上传文件失败。"));
+			return;
+		}
+
+		JSONObject obj = new JSONObject();
+		obj.put("error", 0);
+		obj.put("url", saveUrl + newFileName);
+		out.println(obj.toJSONString());
+	}
+}
+%>
+<%!
+private String getError(String message) {
+	JSONObject obj = new JSONObject();
+	obj.put("error", 1);
+	obj.put("message", message);
+	return obj.toJSONString();
+}
+%>
\ No newline at end of file
diff --git a/public/kindeditor/kindeditor-all-min.js b/public/kindeditor/kindeditor-all-min.js
new file mode 100644
index 0000000..9d4aacb
--- /dev/null
+++ b/public/kindeditor/kindeditor-all-min.js
@@ -0,0 +1,7 @@
+/* KindEditor 4.1.11 (2016-03-31), Copyright (C) kindsoft.net, Licence: http://kindeditor.net/license.php */
+!function(window,undefined){function _isArray(a){return a?"[object Array]"===Object.prototype.toString.call(a):!1}function _isFunction(a){return a?"[object Function]"===Object.prototype.toString.call(a):!1}function _inArray(a,b){for(var c=0,d=b.length;d>c;c++)if(a===b[c])return c;return-1}function _each(a,b){if(_isArray(a))for(var c=0,d=a.length;d>c&&b.call(a[c],c,a[c])!==!1;c++);else for(var e in a)if(a.hasOwnProperty(e)&&b.call(a[e],e,a[e])===!1)break}function _trim(a){return a.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"")}function _inString(a,b,c){return c=c===undefined?",":c,(c+b+c).indexOf(c+a+c)>=0}function _addUnit(a,b){return b=b||"px",a&&/^-?\d+(?:\.\d+)?$/.test(a)?a+b:a}function _removeUnit(a){var b;return a&&(b=/(\d+)/.exec(a))?parseInt(b[1],10):0}function _escape(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}function _unescape(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&")}function _toCamel(a){var b=a.split("-");return a="",_each(b,function(b,c){a+=b>0?c.charAt(0).toUpperCase()+c.substr(1):c}),a}function _toHex(a){function b(a){var b=parseInt(a,10).toString(16).toUpperCase();return b.length>1?b:"0"+b}return a.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/gi,function(a,c,d,e){return"#"+b(c)+b(d)+b(e)})}function _toMap(a,b){b=b===undefined?",":b;var c,d={},e=_isArray(a)?a:a.split(b);return _each(e,function(a,b){if(c=/^(\d+)\.\.(\d+)$/.exec(b))for(var e=parseInt(c[1],10);e<=parseInt(c[2],10);e++)d[e.toString()]=!0;else d[b]=!0}),d}function _toArray(a,b){return Array.prototype.slice.call(a,b||0)}function _undef(a,b){return a===undefined?b:a}function _invalidUrl(a){return!a||/[<>"]/.test(a)}function _addParam(a,b){return a.indexOf("?")>=0?a+"&"+b:a+"?"+b}function _extend(a,b,c){c||(c=b,b=null);var d;if(b){var e=function(){};e.prototype=b.prototype,d=new e,_each(c,function(a,b){d[a]=b})}else d=c;d.constructor=a,a.prototype=d,a.parent=b?b.prototype:null}function _json(text){var match;(match=/\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))&&(text=match[0]);var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;if(cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})),/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return eval("("+text+")");throw"JSON parse error"}function _getBasePath(){for(var a,b=document.getElementsByTagName("script"),c=0,d=b.length;d>c;c++)if(a=b[c].src||"",/kindeditor[\w\-\.]*\.js/.test(a))return a.substring(0,a.lastIndexOf("/")+1);return""}function _bindEvent(a,b,c){a.addEventListener?a.addEventListener(b,c,_useCapture):a.attachEvent&&a.attachEvent("on"+b,c)}function _unbindEvent(a,b,c){a.removeEventListener?a.removeEventListener(b,c,_useCapture):a.detachEvent&&a.detachEvent("on"+b,c)}function KEvent(a,b){this.init(a,b)}function _getId(a){return a[_eventExpendo]||null}function _setId(a){return a[_eventExpendo]=++_eventId,_eventId}function _removeId(a){try{delete a[_eventExpendo]}catch(b){a.removeAttribute&&a.removeAttribute(_eventExpendo)}}function _bind(a,b,c){if(b.indexOf(",")>=0)return void _each(b.split(","),function(){_bind(a,this,c)});var d=_getId(a);d||(d=_setId(a)),_eventData[d]===undefined&&(_eventData[d]={});var e=_eventData[d][b];e&&e.length>0?_unbindEvent(a,b,e[0]):(_eventData[d][b]=[],_eventData[d].el=a),e=_eventData[d][b],0===e.length&&(e[0]=function(b){var c=b?new KEvent(a,b):undefined;_each(e,function(b,d){b>0&&d&&d.call(a,c)})}),_inArray(c,e)<0&&e.push(c),_bindEvent(a,b,e[0])}function _unbind(a,b,c){if(b&&b.indexOf(",")>=0)return void _each(b.split(","),function(){_unbind(a,this,c)});var d=_getId(a);if(d){if(b===undefined)return void(d in _eventData&&(_each(_eventData[d],function(b,c){"el"!=b&&c.length>0&&_unbindEvent(a,b,c[0])}),delete _eventData[d],_removeId(a)));if(_eventData[d]){var e=_eventData[d][b];if(e&&e.length>0){c===undefined?(_unbindEvent(a,b,e[0]),delete _eventData[d][b]):(_each(e,function(a,b){a>0&&b===c&&e.splice(a,1)}),1==e.length&&(_unbindEvent(a,b,e[0]),delete _eventData[d][b]));var f=0;_each(_eventData[d],function(){f++}),2>f&&(delete _eventData[d],_removeId(a))}}}}function _fire(a,b){if(b.indexOf(",")>=0)return void _each(b.split(","),function(){_fire(a,this)});var c=_getId(a);if(c){var d=_eventData[c][b];_eventData[c]&&d&&d.length>0&&d[0]()}}function _ctrl(a,b,c){b=/^\d{2,}$/.test(b)?b:b.toUpperCase().charCodeAt(0),_bind(a,"keydown",function(d){!d.ctrlKey||d.which!=b||d.shiftKey||d.altKey||(c.call(a),d.stop())})}function _ready(a){function b(){e||(e=!0,a(KindEditor),_readyFinished=!0)}function c(){if(!e){try{document.documentElement.doScroll("left")}catch(a){return void setTimeout(c,100)}b()}}function d(){"complete"===document.readyState&&b()}if(_readyFinished)return void a(KindEditor);var e=!1;if(document.addEventListener)_bind(document,"DOMContentLoaded",b);else if(document.attachEvent){_bind(document,"readystatechange",d);var f=!1;try{f=null==window.frameElement}catch(g){}document.documentElement.doScroll&&f&&c()}_bind(window,"load",b)}function _getCssList(a){for(var b,c={},d=/\s*([\w\-]+)\s*:([^;]*)(;|$)/g;b=d.exec(a);){var e=_trim(b[1].toLowerCase()),f=_trim(_toHex(b[2]));c[e]=f}return c}function _getAttrList(a){for(var b,c={},d=/\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g;b=d.exec(a);){var e=(b[1]||b[2]||b[4]||b[6]).toLowerCase(),f=(b[2]?b[3]:b[4]?b[5]:b[7])||"";c[e]=f}return c}function _addClassToTag(a,b){return a=/\s+class\s*=/.test(a)?a.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/,function(a,c,d,e){return(" "+d+" ").indexOf(" "+b+" ")<0?""===d?c+b+e:c+d+" "+b+e:a}):a.substr(0,a.length-1)+' class="'+b+'">'}function _formatCss(a){var b="";return _each(_getCssList(a),function(a,c){b+=a+":"+c+";"}),b}function _formatUrl(a,b,c,d){function e(a){for(var b=a.split("/"),c=[],d=0,e=b.length;e>d;d++){var f=b[d];".."==f?c.length>0&&c.pop():""!==f&&"."!=f&&c.push(f)}return"/"+c.join("/")}function f(b,c){if(a.substr(0,b.length)===b){for(var e=[],g=0;c>g;g++)e.push("..");var i=".";return e.length>0&&(i+="/"+e.join("/")),"/"==d&&(i+="/"),i+a.substr(b.length)}return(h=/^(.*)\//.exec(b))?f(h[1],++c):void 0}if(b=_undef(b,"").toLowerCase(),"data:"!=a.substr(0,5)&&(a=a.replace(/([^:])\/\//g,"$1/")),_inArray(b,["absolute","relative","domain"])<0)return a;if(c=c||location.protocol+"//"+location.host,d===undefined){var g=location.pathname.match(/^(\/.*)\//);d=g?g[1]:""}var h;if(h=/^(\w+:\/\/[^\/]*)/.exec(a)){if(h[1]!==c)return a}else if(/^\w+:/.test(a))return a;return/^\//.test(a)?a=c+e(a.substr(1)):/^\w+:\/\//.test(a)||(a=c+e(d+"/"+a)),"relative"===b?a=f(c+d,0).substr(2):"absolute"===b&&a.substr(0,c.length)===c&&(a=a.substr(c.length)),a}function _formatHtml(a,b,c,d,e){null==a&&(a=""),c=c||"",d=_undef(d,!1),e=_undef(e,"	");var f="xx-small,x-small,small,medium,large,x-large,xx-large".split(",");a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/gi,function(a,b,c,d){return b+c.replace(/<(?:br|br\s[^>]*)>/gi,"\n")+d}),a=a.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/gi,"</p>"),a=a.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/gi,"$1<br />$2"),a=a.replace(/\u200B/g,""),a=a.replace(/\u00A9/g,"&copy;"),a=a.replace(/\u00AE/g,"&reg;"),a=a.replace(/\u2003/g,"&emsp;"),a=a.replace(/\u3000/g,"&emsp;"),a=a.replace(/<[^>]+/g,function(a){return a.replace(/\s+/g," ")});var g={};b&&(_each(b,function(a,b){for(var c=a.split(","),d=0,e=c.length;e>d;d++)g[c[d]]=_toMap(b)}),g.script||(a=a.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/gi,"")),g.style||(a=a.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/gi,"")));var h=/(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g,i=[];return a=a.replace(h,function(a,h,j,k,l,m,n){var o=a,p=h||"",q=j||"",r=k.toLowerCase(),s=l||"",t=m?" "+m:"",u=n||"";if(b&&!g[r])return"";if(""===t&&_SINGLE_TAG_MAP[r]&&(t=" /"),_INLINE_TAG_MAP[r]&&(p&&(p=" "),u&&(u=" ")),_PRE_TAG_MAP[r]&&(q?u="\n":p="\n"),d&&"br"==r&&(u="\n"),_BLOCK_TAG_MAP[r]&&!_PRE_TAG_MAP[r])if(d){q&&i.length>0&&i[i.length-1]===r?i.pop():i.push(r),p="\n",u="\n";for(var v=0,w=q?i.length:i.length-1;w>v;v++)p+=e,q||(u+=e);t?i.pop():q||(u+=e)}else p=u="";if(""!==s){var x=_getAttrList(o);if("font"===r){var y={},z="";_each(x,function(a,b){"color"===a&&(y.color=b,delete x[a]),"size"===a&&(y["font-size"]=f[parseInt(b,10)-1]||"",delete x[a]),"face"===a&&(y["font-family"]=b,delete x[a]),"style"===a&&(z=b)}),z&&!/;$/.test(z)&&(z+=";"),_each(y,function(a,b){""!==b&&(/\s/.test(b)&&(b="'"+b+"'"),z+=a+":"+b+";")}),x.style=z}_each(x,function(a,d){if(_FILL_ATTR_MAP[a]&&(x[a]=a),_inArray(a,["src","href"])>=0&&(x[a]=_formatUrl(d,c)),(b&&"style"!==a&&!g[r]["*"]&&!g[r][a]||"body"===r&&"contenteditable"===a||/^kindeditor_\d+$/.test(a))&&delete x[a],"style"===a&&""!==d){var e=_getCssList(d);_each(e,function(a){!b||g[r].style||g[r]["."+a]||delete e[a]});var f="";_each(e,function(a,b){f+=a+":"+b+";"}),x.style=f}}),s="",_each(x,function(a,b){("style"!==a||""!==b)&&(b=b.replace(/"/g,"&quot;"),s+=" "+a+'="'+b+'"')})}return"font"===r&&(r="span"),p+"<"+q+r+s+t+">"+u}),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/gi,function(a,b,c,d){return b+c.replace(/\n/g,'<span id="__kindeditor_pre_newline__">\n')+d}),a=a.replace(/\n\s*\n/g,"\n"),a=a.replace(/<span id="__kindeditor_pre_newline__">\n/g,"\n"),_trim(a)}function _clearMsWord(a,b){return a=a.replace(/<meta[\s\S]*?>/gi,"").replace(/<![\s\S]*?>/gi,"").replace(/<style[^>]*>[\s\S]*?<\/style>/gi,"").replace(/<script[^>]*>[\s\S]*?<\/script>/gi,"").replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/gi,"").replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/gi,"").replace(/<xml>[\s\S]*?<\/xml>/gi,"").replace(/<(?:table|td)[^>]*>/gi,function(a){return a.replace(/border-bottom:([#\w\s]+)/gi,"border:$1")}),_formatHtml(a,b)}function _mediaType(a){return/\.(rm|rmvb)(\?|$)/i.test(a)?"audio/x-pn-realaudio-plugin":/\.(swf|flv)(\?|$)/i.test(a)?"application/x-shockwave-flash":"video/x-ms-asf-plugin"}function _mediaClass(a){return/realaudio/i.test(a)?"ke-rm":/flash/i.test(a)?"ke-flash":"ke-media"}function _mediaAttrs(a){return _getAttrList(unescape(a))}function _mediaEmbed(a){var b="<embed ";return _each(a,function(a,c){b+=a+'="'+c+'" '}),b+="/>"}function _mediaImg(a,b){var c=b.width,d=b.height,e=b.type||_mediaType(b.src),f=_mediaEmbed(b),g="";/\D/.test(c)?g+="width:"+c+";":c>0&&(g+="width:"+c+"px;"),/\D/.test(d)?g+="height:"+d+";":d>0&&(g+="height:"+d+"px;");var h='<img class="'+_mediaClass(e)+'" src="'+a+'" ';return""!==g&&(h+='style="'+g+'" '),h+='data-ke-tag="'+escape(f)+'" alt="" />'}function _tmpl(a,b){var c=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g," ").split("<%").join("	").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("	").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');");return b?c(b):c}function _contains(a,b){if(9==a.nodeType&&9!=b.nodeType)return!0;for(;b=b.parentNode;)if(b==a)return!0;return!1}function _getAttr(a,b){b=b.toLowerCase();var c=null;if(_GET_SET_ATTRIBUTE||"script"==a.nodeName.toLowerCase())try{c=a.getAttribute(b,2)}catch(d){c=a.getAttribute(b,1)}else{var e=a.ownerDocument.createElement("div");e.appendChild(a.cloneNode(!1));var f=_getAttrList(_unescape(e.innerHTML));b in f&&(c=f[b])}return"style"===b&&null!==c&&(c=_formatCss(c)),c}function _queryAll(a,b){function c(a){return"string"!=typeof a?a:a.replace(/([^\w\-])/g,"\\$1")}function d(a){return a.replace(/\\/g,"")}function e(a,b){return"*"===a||a.toLowerCase()===c(b.toLowerCase())}function f(a,b,c){var f=[],g=c.ownerDocument||c,h=g.getElementById(d(a));return h&&e(b,h.nodeName)&&_contains(c,h)&&f.push(h),f}function g(a,b,c){var f,g,h,i,j=c.ownerDocument||c,k=[];if(c.getElementsByClassName)for(f=c.getElementsByClassName(d(a)),g=0,h=f.length;h>g;g++)i=f[g],e(b,i.nodeName)&&k.push(i);else if(j.querySelectorAll)for(f=j.querySelectorAll(("#document"!==c.nodeName?c.nodeName+" ":"")+b+"."+a),g=0,h=f.length;h>g;g++)i=f[g],_contains(c,i)&&k.push(i);else for(f=c.getElementsByTagName(b),a=" "+a+" ",g=0,h=f.length;h>g;g++)if(i=f[g],1==i.nodeType){var l=i.className;l&&(" "+l+" ").indexOf(a)>-1&&k.push(i)}return k}function h(a,b,c){for(var f,g=[],h=c.ownerDocument||c,i=h.getElementsByName(d(a)),j=0,k=i.length;k>j;j++)f=i[j],e(b,f.nodeName)&&_contains(c,f)&&null!==f.getAttribute("name")&&g.push(f);return g}function i(a,b,d,e){for(var f,g=[],h=e.getElementsByTagName(d),i=0,j=h.length;j>i;i++)f=h[i],1==f.nodeType&&(null===b?null!==_getAttr(f,a)&&g.push(f):b===c(_getAttr(f,a))&&g.push(f));return g}function j(a,b){var c,d=[];c=/^((?:\\.|[^.#\s\[<>])+)/.exec(a);var e=c?c[1]:"*";if(c=/#((?:[\w\-]|\\.)+)$/.exec(a))d=f(c[1],e,b);else if(c=/\.((?:[\w\-]|\\.)+)$/.exec(a))d=g(c[1],e,b);else if(c=/\[((?:[\w\-]|\\.)+)\]/.exec(a))d=i(c[1].toLowerCase(),null,e,b);else if(c=/\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(a)){var j=c[1].toLowerCase(),k=c[2];d="id"===j?f(k,e,b):"class"===j?g(k,e,b):"name"===j?h(k,e,b):i(j,k,e,b)}else for(var l,m=b.getElementsByTagName(e),n=0,o=m.length;o>n;n++)l=m[n],1==l.nodeType&&d.push(l);return d}var k=a.split(",");if(k.length>1){var l=[];return _each(k,function(){_each(_queryAll(this,b),function(){_inArray(this,l)<0&&l.push(this)})}),l}b=b||document;for(var m,n=[],o=/((?:\\.|[^\s>])+|[\s>])/g;m=o.exec(a);)" "!==m[1]&&n.push(m[1]);var p=[];if(1==n.length)return j(n[0],b);var q,r,s,t,u,v,w,x,y,z,A=!1;for(v=0,lenth=n.length;v<lenth;v++)if(q=n[v],">"!==q){if(v>0){for(r=[],w=0,y=p.length;y>w;w++)for(t=p[w],s=j(q,t),x=0,z=s.length;z>x;x++)u=s[x],A?t===u.parentNode&&r.push(u):r.push(u);p=r}else p=j(q,b);if(0===p.length)return[]}else A=!0;return p}function _query(a,b){var c=_queryAll(a,b);return c.length>0?c[0]:null}function _get(a){return K(a)[0]}function _getDoc(a){return a?a.ownerDocument||a.document||a:document}function _getWin(a){if(!a)return window;var b=_getDoc(a);return b.parentWindow||b.defaultView}function _setHtml(a,b){if(1==a.nodeType){var c=_getDoc(a);try{a.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b;var d=c.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d)}catch(e){K(a).empty(),K("@"+b,c).each(function(){a.appendChild(this)})}}}function _hasClass(a,b){return _inString(b,a.className," ")}function _setAttr(a,b,c){_IE&&8>_V&&"class"==b.toLowerCase()&&(b="className"),a.setAttribute(b,""+c)}function _removeAttr(a,b){_IE&&8>_V&&"class"==b.toLowerCase()&&(b="className"),_setAttr(a,b,""),a.removeAttribute(b)}function _getNodeName(a){return a&&a.nodeName?a.nodeName.toLowerCase():""}function _computedCss(a,b){var c=_getWin(a),d=_toCamel(b),e="";if(c.getComputedStyle){var f=c.getComputedStyle(a,null);e=f[d]||f.getPropertyValue(b)||a.style[d]}else a.currentStyle&&(e=a.currentStyle[d]||a.style[d]);return e}function _hasVal(a){return!!_VALUE_TAG_MAP[_getNodeName(a)]}function _docElement(a){return a=a||document,_QUIRKS?a.body:a.documentElement}function _docHeight(a){var b=_docElement(a);return Math.max(b.scrollHeight,b.clientHeight)}function _docWidth(a){var b=_docElement(a);return Math.max(b.scrollWidth,b.clientWidth)}function _getScrollPos(a){a=a||document;var b,c;return _IE||_NEWIE||_OPERA?(b=_docElement(a).scrollLeft,c=_docElement(a).scrollTop):(b=_getWin(a).scrollX,c=_getWin(a).scrollY),{x:b,y:c}}function KNode(a){this.init(a)}function _updateCollapsed(a){return a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset,a}function _copyAndDelete(a,b,c){function d(d,e,f){var g,i=d.nodeValue.length;if(b){var j=d.cloneNode(!0);g=e>0?j.splitText(e):j,i>f&&g.splitText(f-e)}if(c){var k=d;if(e>0&&(k=d.splitText(e),a.setStart(d,e)),i>f){var l=k.splitText(f-e);a.setEnd(l,0)}h.push(k)}return g}function e(){c&&a.up().collapse(!0);for(var b=0,d=h.length;d>b;b++){var e=h[b];e.parentNode&&e.parentNode.removeChild(e)}}function f(e,n){for(var o,p=e.firstChild;p;){var q=new KRange(g).selectNode(p);if(j=q.compareBoundaryPoints(_START_TO_END,a),j>=0&&0>=k&&(k=q.compareBoundaryPoints(_START_TO_START,a)),k>=0&&0>=l&&(l=q.compareBoundaryPoints(_END_TO_END,a)),l>=0&&0>=m&&(m=q.compareBoundaryPoints(_END_TO_START,a)),m>=0)return!1;if(o=p.nextSibling,j>0)if(1==p.nodeType)if(k>=0&&0>=l)b&&n.appendChild(p.cloneNode(!0)),c&&h.push(p);else{var r;if(b&&(r=p.cloneNode(!1),n.appendChild(r)),f(p,r)===!1)return!1}else if(3==p.nodeType){var s;if(s=p==i.startContainer?d(p,i.startOffset,p.nodeValue.length):p==i.endContainer?d(p,0,i.endOffset):d(p,0,p.nodeValue.length),b)try{n.appendChild(s)}catch(t){}}p=o}}var g=a.doc,h=[],i=a.cloneRange().down(),j=-1,k=-1,l=-1,m=-1,n=a.commonAncestor(),o=g.createDocumentFragment();if(3==n.nodeType){var p=d(n,a.startOffset,a.endOffset);return b&&o.appendChild(p),e(),b?o:a}f(n,o),c&&a.up().collapse(!0);for(var q=0,r=h.length;r>q;q++){var s=h[q];s.parentNode&&s.parentNode.removeChild(s)}return b?o:a}function _moveToElementText(a,b){for(var c=b;c;){var d=K(c);if("marquee"==d.name||"select"==d.name)return;c=c.parentNode}try{a.moveToElementText(b)}catch(e){}}function _getStartEnd(a,b){var c=a.parentElement().ownerDocument,d=a.duplicate();d.collapse(b);var e=d.parentElement(),f=e.childNodes;if(0===f.length)return{node:e.parentNode,offset:K(e).index()};var g=c,h=0,i=-1,j=a.duplicate();_moveToElementText(j,e);for(var k=0,l=f.length;l>k;k++){var m=f[k];if(i=j.compareEndPoints("StartToStart",d),0===i)return{node:m.parentNode,offset:k};if(1==m.nodeType){var n,o=a.duplicate(),p=K(m),q=m;p.isControl()&&(n=c.createElement("span"),p.after(n),q=n,h+=p.text().replace(/\r\n|\n|\r/g,"").length),_moveToElementText(o,q),j.setEndPoint("StartToEnd",o),i>0?h+=o.text.replace(/\r\n|\n|\r/g,"").length:h=0,n&&K(n).remove()}else 3==m.nodeType&&(j.moveStart("character",m.nodeValue.length),h+=m.nodeValue.length);0>i&&(g=m)}if(0>i&&1==g.nodeType)return{node:e,offset:K(e.lastChild).index()+1};if(i>0)for(;g.nextSibling&&1==g.nodeType;)g=g.nextSibling;if(j=a.duplicate(),_moveToElementText(j,e),j.setEndPoint("StartToEnd",d),h-=j.text.replace(/\r\n|\n|\r/g,"").length,i>0&&3==g.nodeType)for(var r=g.previousSibling;r&&3==r.nodeType;)h-=r.nodeValue.length,r=r.previousSibling;return{node:g,offset:h}}function _getEndRange(a,b){var c=a.ownerDocument||a,d=c.body.createTextRange();if(c==a)return d.collapse(!0),d;if(1==a.nodeType&&a.childNodes.length>0){var e,f,g=a.childNodes;if(0===b?(f=g[0],e=!0):(f=g[b-1],e=!1),!f)return d;if("head"===K(f).name)return 1===b&&(e=!0),2===b&&(e=!1),d.collapse(e),d;if(1==f.nodeType){var h,i=K(f);return i.isControl()&&(h=c.createElement("span"),e?i.before(h):i.after(h),f=h),_moveToElementText(d,f),d.collapse(e),h&&K(h).remove(),d}a=f,b=e?0:f.nodeValue.length}var j=c.createElement("span");return K(a).before(j),_moveToElementText(d,j),d.moveStart("character",b),K(j).remove(),d}function _toRange(a){function b(a){"tr"==K(a.node).name&&(a.node=a.node.cells[a.offset],a.offset=0)}var c,d;if(_IERANGE){if(a.item)return c=_getDoc(a.item(0)),d=new KRange(c),d.selectNode(a.item(0)),d;c=a.parentElement().ownerDocument;var e=_getStartEnd(a,!0),f=_getStartEnd(a,!1);return b(e),b(f),d=new KRange(c),d.setStart(e.node,e.offset),d.setEnd(f.node,f.offset),d}var g=a.startContainer;return c=g.ownerDocument||g,d=new KRange(c),d.setStart(g,a.startOffset),d.setEnd(a.endContainer,a.endOffset),d}function KRange(a){this.init(a)}function _range(a){return a.nodeName?new KRange(a):a.constructor===KRange?a:_toRange(a)}function _nativeCommand(a,b,c){try{a.execCommand(b,!1,c)}catch(d){}}function _nativeCommandValue(a,b){var c="";try{c=a.queryCommandValue(b)}catch(d){}return"string"!=typeof c&&(c=""),c}function _getSel(a){var b=_getWin(a);return _IERANGE?a.selection:b.getSelection()}function _getRng(a){var b,c=_getSel(a);try{b=c.rangeCount>0?c.getRangeAt(0):c.createRange()}catch(d){}return!_IERANGE||b&&(b.item||b.parentElement().ownerDocument===a)?b:null}function _singleKeyMap(a){var b,c,d={};return _each(a,function(a,e){b=a.split(",");for(var f=0,g=b.length;g>f;f++)c=b[f],d[c]=e}),d}function _hasAttrOrCss(a,b){return _hasAttrOrCssByKey(a,b,"*")||_hasAttrOrCssByKey(a,b)}function _hasAttrOrCssByKey(a,b,c){if(c=c||a.name,1!==a.type)return!1;var d=_singleKeyMap(b);if(!d[c])return!1;for(var e=d[c].split(","),f=0,g=e.length;g>f;f++){var h=e[f];if("*"===h)return!0;var i=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(h),j=i[1]?"css":"attr";h=i[2];var k=i[3]||"";if(""===k&&""!==a[j](h))return!0;if(""!==k&&a[j](h)===k)return!0}return!1}function _removeAttrOrCss(a,b){1==a.type&&(_removeAttrOrCssByKey(a,b,"*"),_removeAttrOrCssByKey(a,b))}function _removeAttrOrCssByKey(a,b,c){if(c=c||a.name,1===a.type){var d=_singleKeyMap(b);if(d[c]){for(var e=d[c].split(","),f=!1,g=0,h=e.length;h>g;g++){var i=e[g];if("*"===i){f=!0;break}var j=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(i);i=j[2],j[1]?(i=_toCamel(i),a[0].style[i]&&(a[0].style[i]="")):a.removeAttr(i)}f&&a.remove(!0)}}}function _getInnerNode(a){for(var b=a;b.first();)b=b.first();return b}function _isEmptyNode(a){return 1!=a.type||a.isSingle()?!1:""===a.html().replace(/<[^>]+>/g,"")}function _mergeWrapper(a,b){a=a.clone(!0);for(var c=_getInnerNode(a),d=a,e=!1;b;){for(;d;)d.name===b.name&&(_mergeAttrs(d,b.attr(),b.css()),e=!0),d=d.first();e||c.append(b.clone(!1)),e=!1,b=b.first()}return a}function _wrapNode(a,b){if(b=b.clone(!0),3==a.type)return _getInnerNode(b).append(a.clone(!1)),a.replaceWith(b),b;for(var c,d=a;(c=a.first())&&1==c.children().length;)a=c;c=a.first();for(var e=a.doc.createDocumentFragment();c;)e.appendChild(c[0]),c=c.next();return b=_mergeWrapper(d,b),e.firstChild&&_getInnerNode(b).append(e),d.replaceWith(b),b}function _mergeAttrs(a,b,c){_each(b,function(b,c){"style"!==b&&a.attr(b,c)}),_each(c,function(b,c){a.css(b,c)})}function _inPreElement(a){for(;a&&"body"!=a.name;){if(_PRE_TAG_MAP[a.name]||"div"==a.name&&a.hasClass("ke-script"))return!0;a=a.parent()}return!1}function KCmd(a){this.init(a)}function _cmd(a){if(a.nodeName){var b=_getDoc(a);a=_range(b).selectNodeContents(b.body).collapse(!1)}return new KCmd(a)}function _drag(a){var b=a.moveEl,c=a.moveFn,d=a.clickEl||b,e=a.beforeDrag,f=a.iframeFix===undefined?!0:a.iframeFix,g=[document];f&&K("iframe").each(function(){var a=_formatUrl(this.src||"","absolute");if(!/^https?:\/\//.test(a)){var b;try{b=_iframeDoc(this)}catch(c){}if(b){var d=K(this).pos();K(b).data("pos-x",d.x),K(b).data("pos-y",d.y),g.push(b)}}}),d.mousedown(function(a){function f(a){a.preventDefault();var b=K(_getDoc(a.target)),e=_round((b.data("pos-x")||0)+a.pageX-o),f=_round((b.data("pos-y")||0)+a.pageY-p);c.call(d,k,l,m,n,e,f)}function h(a){a.preventDefault()}function i(a){a.preventDefault(),K(g).unbind("mousemove",f).unbind("mouseup",i).unbind("selectstart",h),j.releaseCapture&&j.releaseCapture()}if(0===a.button||1===a.button){a.stopPropagation();var j=d.get(),k=_removeUnit(b.css("left")),l=_removeUnit(b.css("top")),m=b.width(),n=b.height(),o=a.pageX,p=a.pageY;e&&e(),K(g).mousemove(f).mouseup(i).bind("selectstart",h),j.setCapture&&j.setCapture()}})}function KWidget(a){this.init(a)}function _widget(a){return new KWidget(a)}function _iframeDoc(a){return a=_get(a),a.contentDocument||a.contentWindow.document}function _getInitHtml(a,b,c,d){var e=[""===_direction?"<html>":'<html dir="'+_direction+'">','<head><meta charset="utf-8" /><title></title>',"<style>","html {margin:0;padding:0;}","body {margin:0;padding:5px;}",'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',"body, p, div {word-wrap: break-word;}","p {margin:5px 0;}","table {border-collapse:collapse;}","img {border:0;}","noscript {display:none;}","table.ke-zeroborder td {border:1px dotted #AAA;}","img.ke-flash {","	border:1px solid #AAA;","	background-image:url("+a+"common/flash.gif);","	background-position:center center;","	background-repeat:no-repeat;","	width:100px;","	height:100px;","}","img.ke-rm {","	border:1px solid #AAA;","	background-image:url("+a+"common/rm.gif);","	background-position:center center;","	background-repeat:no-repeat;","	width:100px;","	height:100px;","}","img.ke-media {","	border:1px solid #AAA;","	background-image:url("+a+"common/media.gif);","	background-position:center center;","	background-repeat:no-repeat;","	width:100px;","	height:100px;","}","img.ke-anchor {","	border:1px dashed #666;","	width:16px;","	height:16px;","}",".ke-script, .ke-noscript, .ke-display-none {","	display:none;","	font-size:0;","	width:0;","	height:0;","}",".ke-pagebreak {","	border:1px dotted #AAA;","	font-size:0;","	height:2px;","}","</style>"];return _isArray(c)||(c=[c]),_each(c,function(a,b){b&&e.push('<link href="'+b+'" rel="stylesheet" />')}),d&&e.push("<style>"+d+"</style>"),e.push("</head><body "+(b?'class="'+b+'"':"")+"></body></html>"),e.join("\n")}function _elementVal(a,b){if(a.hasVal()){if(b===undefined){var c=a.val();return c=c.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/gi,"")}return a.val(b)}return a.html(b)}function KEdit(a){this.init(a)}function _edit(a){return new KEdit(a)}function _selectToolbar(a,b){var c=this,d=c.get(a);if(d){if(d.hasClass("ke-disabled"))return;b(d)}}function KToolbar(a){this.init(a)}function _toolbar(a){return new KToolbar(a)}function KMenu(a){this.init(a)}function _menu(a){return new KMenu(a)}function KColorPicker(a){this.init(a)}function _colorpicker(a){return new KColorPicker(a)}function KUploadButton(a){this.init(a)}function _uploadbutton(a){return new KUploadButton(a)}function _createButton(a){a=a||{};var b=a.name||"",c=K('<span class="ke-button-common ke-button-outer" title="'+b+'"></span>'),d=K('<input class="ke-button-common ke-button" type="button" value="'+b+'" />');return a.click&&d.click(a.click),c.append(d),c}function KDialog(a){this.init(a)}function _dialog(a){return new KDialog(a)}function _tabs(a){var b=_widget(a),c=b.remove,d=a.afterSelect,e=b.div,f=[];e.addClass("ke-tabs").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()});var g=K('<ul class="ke-tabs-ul ke-clearfix"></ul>');return e.append(g),b.add=function(a){var b=K('<li class="ke-tabs-li">'+a.title+"</li>");b.data("tab",a),f.push(b),g.append(b)},b.selectedIndex=0,b.select=function(a){b.selectedIndex=a,_each(f,function(c,d){d.unbind(),c===a?(d.addClass("ke-tabs-li-selected"),K(d.data("tab").panel).show("")):(d.removeClass("ke-tabs-li-selected").removeClass("ke-tabs-li-on").mouseover(function(){K(this).addClass("ke-tabs-li-on")}).mouseout(function(){K(this).removeClass("ke-tabs-li-on")}).click(function(){b.select(c)}),K(d.data("tab").panel).hide())}),d&&d.call(b,a)},b.remove=function(){_each(f,function(){this.remove()}),g.remove(),c.call(b)},b}function _loadScript(a,b){var c=document.getElementsByTagName("head")[0]||(_QUIRKS?document.body:document.documentElement),d=document.createElement("script");c.appendChild(d),d.src=a,d.charset="utf-8",d.onload=d.onreadystatechange=function(){this.readyState&&"loaded"!==this.readyState||(b&&b(),d.onload=d.onreadystatechange=null,c.removeChild(d))}}function _chopQuery(a){var b=a.indexOf("?");return b>0?a.substr(0,b):a}function _loadStyle(a){for(var b=document.getElementsByTagName("head")[0]||(_QUIRKS?document.body:document.documentElement),c=document.createElement("link"),d=_chopQuery(_formatUrl(a,"absolute")),e=K('link[rel="stylesheet"]',b),f=0,g=e.length;g>f;f++)if(_chopQuery(_formatUrl(e[f].href,"absolute"))===d)return;b.appendChild(c),c.href=a,c.rel="stylesheet"}function _ajax(a,b,c,d,e){c=c||"GET",e=e||"json";var f=window.XMLHttpRequest?new window.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");if(f.open(c,a,!0),f.onreadystatechange=function(){if(4==f.readyState&&200==f.status&&b){var a=_trim(f.responseText);"json"==e&&(a=_json(a)),b(a)}},"POST"==c){var g=[];_each(d,function(a,b){g.push(encodeURIComponent(a)+"="+encodeURIComponent(b))});try{f.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(h){}f.send(g.join("&"))}else f.send(null)}function _plugin(a,b){return a===undefined?_plugins:b?void(_plugins[a]=b):_plugins[a]}function _parseLangKey(a){var b,c="core";return(b=/^(\w+)\.(\w+)$/.exec(a))&&(c=b[1],a=b[2]),{ns:c,key:a}}function _lang(a,b){if(b=b===undefined?K.options.langType:b,"string"==typeof a){if(!_language[b])return"no language";var c=a.length-1;if("."===a.substr(c))return _language[b][a.substr(0,c)];var d=_parseLangKey(a);return _language[b][d.ns][d.key]}_each(a,function(a,c){var d=_parseLangKey(a);_language[b]||(_language[b]={}),_language[b][d.ns]||(_language[b][d.ns]={}),_language[b][d.ns][d.key]=c})}function _getImageFromRange(a,b){if(!a.collapsed){a=a.cloneRange().up();var c=a.startContainer,d=a.startOffset;if(_WEBKIT||a.isControl()){var e=K(c.childNodes[d]);if(e&&"img"==e.name)return b(e)?e:void 0}}}function _bindContextmenuEvent(){var a=this,b=a.edit.doc;K(b).contextmenu(function(b){if(a.menu&&a.hideMenu(),!a.useContextmenu)return void b.preventDefault();if(0!==a._contextmenus.length){var c=0,d=[];for(_each(a._contextmenus,function(){return"-"==this.title?void d.push(this):void(this.cond&&this.cond()&&(d.push(this),this.width&&this.width>c&&(c=this.width)))});d.length>0&&"-"==d[0].title;)d.shift();for(;d.length>0&&"-"==d[d.length-1].title;)d.pop();var e=null;if(_each(d,function(a){"-"==this.title&&"-"==e.title&&delete d[a],e=this}),d.length>0){b.preventDefault();var f=K(a.edit.iframe).pos(),g=_menu({x:f.x+b.clientX,y:f.y+b.clientY,width:c,css:{visibility:"hidden"},shadowMode:a.shadowMode});_each(d,function(){this.title&&g.addItem(this)});var h=_docElement(g.doc),i=g.div.height();b.clientY+i>=h.clientHeight-100&&g.pos(g.x,_removeUnit(g.y)-i),g.div.css("visibility","visible"),a.menu=g}}})}function _bindNewlineEvent(){function a(a){for(var b=K(a.commonAncestor());b&&(1!=b.type||b.isStyle());)b=b.parent();return b.name}var b=this,c=b.edit.doc,d=b.newlineTag;if(!(_IE&&"br"!==d||_GECKO&&3>_V&&"p"!==d||_OPERA&&9>_V)){var e=_toMap("h1,h2,h3,h4,h5,h6,pre,li"),f=_toMap("p,h1,h2,h3,h4,h5,h6,pre,li,blockquote");K(c).keydown(function(g){if(!(13!=g.which||g.shiftKey||g.ctrlKey||g.altKey)){b.cmd.selection();var h=a(b.cmd.range);if("marquee"!=h&&"select"!=h)return"br"!==d||e[h]?void(f[h]||_nativeCommand(c,"formatblock","<p>")):(g.preventDefault(),void b.insertHtml("<br />"+(_IE&&9>_V?"":"​")))}}),K(c).keyup(function(e){if(!(13!=e.which||e.shiftKey||e.ctrlKey||e.altKey)&&"br"!=d){if(_GECKO){var g=b.cmd.commonAncestor("p"),h=b.cmd.commonAncestor("a");return void(h&&""==h.text()&&(h.remove(!0),b.cmd.range.selectNodeContents(g[0]).collapse(!0),b.cmd.select()))}b.cmd.selection();var i=a(b.cmd.range);if("marquee"!=i&&"select"!=i){f[i]||_nativeCommand(c,"formatblock","<p>");var j=b.cmd.commonAncestor("div");if(j){for(var k=K("<p></p>"),l=j[0].firstChild;l;){var m=l.nextSibling;k.append(l),l=m}j.before(k),j.remove(),b.cmd.range.selectNodeContents(k[0]),b.cmd.select()}}}})}}function _bindTabEvent(){var a=this,b=a.edit.doc;K(b).keydown(function(c){if(9==c.which){if(c.preventDefault(),a.afterTab)return void a.afterTab.call(a,c);var d=a.cmd,e=d.range;e.shrink(),e.collapsed&&1==e.startContainer.nodeType&&(e.insertNode(K("@&nbsp;",b)[0]),d.select()),a.insertHtml("&nbsp;&nbsp;&nbsp;&nbsp;")}})}function _bindFocusEvent(){var a=this;K(a.edit.textarea[0],a.edit.win).focus(function(b){a.afterFocus&&a.afterFocus.call(a,b)}).blur(function(b){a.afterBlur&&a.afterBlur.call(a,b)})}function _removeBookmarkTag(a){return _trim(a.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/gi,""))}function _removeTempTag(a){return a.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/gi,"")}function _addBookmarkToStack(a,b){if(0===a.length)return void a.push(b);var c=a[a.length-1];_removeBookmarkTag(b.html)!==_removeBookmarkTag(c.html)&&a.push(b)}function _undoToRedo(a,b){var c,d,e=this,f=e.edit,g=f.doc.body;if(0===a.length)return e;f.designMode?(c=e.cmd.range,d=c.createBookmark(!0),d.html=g.innerHTML):d={html:g.innerHTML},_addBookmarkToStack(b,d);
+var h=a.pop();return _removeBookmarkTag(d.html)===_removeBookmarkTag(h.html)&&a.length>0&&(h=a.pop()),f.designMode?(f.html(h.html),h.start&&(c.moveToBookmark(h),e.select())):K(g).html(_removeBookmarkTag(h.html)),e}function KEditor(a){function b(a,b){KEditor.prototype[a]===undefined&&(c[a]=b),c.options[a]=b}var c=this;c.options={},_each(a,function(c){b(c,a[c])}),_each(K.options,function(a,d){c[a]===undefined&&b(a,d)});var d=K(c.srcElement||"<textarea/>");c.width||(c.width=d[0].style.width||d.width()),c.height||(c.height=d[0].style.height||d.height()),b("width",_undef(c.width,c.minWidth)),b("height",_undef(c.height,c.minHeight)),b("width",_addUnit(c.width)),b("height",_addUnit(c.height)),_MOBILE&&(!_IOS||534>_V)&&(c.designMode=!1),c.srcElement=d,c.initContent="",c.plugin={},c.isCreated=!1,c._handlers={},c._contextmenus=[],c._undoStack=[],c._redoStack=[],c._firstAddBookmark=!0,c.menu=c.contextmenu=null,c.dialogs=[]}function _editor(a){return new KEditor(a)}function _create(a,b){function c(a){return _each(_plugins,function(b,c){_isFunction(c)&&(c.call(a,KindEditor),a._pluginStatus||(a._pluginStatus={}),a._pluginStatus[b]="inited")}),a.create()}if(b=b||{},b.basePath=_undef(b.basePath,K.basePath),b.themesPath=_undef(b.themesPath,b.basePath+"themes/"),b.langPath=_undef(b.langPath,b.basePath+"lang/"),b.pluginsPath=_undef(b.pluginsPath,b.basePath+"plugins/"),_undef(b.loadStyleMode,K.options.loadStyleMode)){var d=_undef(b.themeType,K.options.themeType);_loadStyle(b.themesPath+"default/default.css"),_loadStyle(b.themesPath+d+"/"+d+".css")}var e=K(a);if(e&&0!==e.length){if(e.length>1)return e.each(function(){_create(this,b)}),_instances[0];b.srcElement=e[0];var f=new KEditor(b);return _instances.push(f),_language[f.langType]?c(f):(_loadScript(f.langPath+f.langType+".js?ver="+encodeURIComponent(K.DEBUG?_TIME:_VERSION),function(){c(f)}),f)}}function _eachEditor(a,b){K(a).each(function(a,c){K.each(_instances,function(a,d){return d&&d.srcElement[0]==c?(b.call(d,a),!1):void 0})})}if(!window.KindEditor){window.console||(window.console={}),console.log||(console.log=function(){});var _VERSION="4.1.11 (2016-03-31)",_ua=navigator.userAgent.toLowerCase(),_IE=_ua.indexOf("msie")>-1&&-1==_ua.indexOf("opera"),_NEWIE=-1==_ua.indexOf("msie")&&_ua.indexOf("trident")>-1,_GECKO=_ua.indexOf("gecko")>-1&&-1==_ua.indexOf("khtml"),_WEBKIT=_ua.indexOf("applewebkit")>-1,_OPERA=_ua.indexOf("opera")>-1,_MOBILE=_ua.indexOf("mobile")>-1,_IOS=/ipad|iphone|ipod/.test(_ua),_QUIRKS="CSS1Compat"!=document.compatMode,_IERANGE=!window.getSelection,_matches=/(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),_V=_matches?_matches[1]:"0",_TIME=(new Date).getTime(),_round=Math.round,K={DEBUG:!1,VERSION:_VERSION,IE:_IE,GECKO:_GECKO,WEBKIT:_WEBKIT,OPERA:_OPERA,V:_V,TIME:_TIME,each:_each,isArray:_isArray,isFunction:_isFunction,inArray:_inArray,inString:_inString,trim:_trim,addUnit:_addUnit,removeUnit:_removeUnit,escape:_escape,unescape:_unescape,toCamel:_toCamel,toHex:_toHex,toMap:_toMap,toArray:_toArray,undef:_undef,invalidUrl:_invalidUrl,addParam:_addParam,extend:_extend,json:_json},_INLINE_TAG_MAP=_toMap("a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"),_BLOCK_TAG_MAP=_toMap("address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul"),_SINGLE_TAG_MAP=_toMap("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"),_STYLE_TAG_MAP=_toMap("b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u"),_CONTROL_TAG_MAP=_toMap("img,table,input,textarea,button"),_PRE_TAG_MAP=_toMap("pre,style,script"),_NOSPLIT_TAG_MAP=_toMap("html,head,body,td,tr,table,ol,ul,li"),_AUTOCLOSE_TAG_MAP=_toMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr"),_FILL_ATTR_MAP=_toMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),_VALUE_TAG_MAP=_toMap("input,button,textarea,select");K.basePath=_getBasePath(),K.options={designMode:!0,fullscreenMode:!1,filterMode:!0,wellFormatMode:!0,shadowMode:!0,loadStyleMode:!0,basePath:K.basePath,themesPath:K.basePath+"themes/",langPath:K.basePath+"lang/",pluginsPath:K.basePath+"plugins/",themeType:"default",langType:"zh-CN",urlType:"",newlineTag:"p",resizeType:2,syncType:"form",pasteType:2,dialogAlignType:"page",useContextmenu:!0,fullscreenShortcut:!1,bodyClass:"ke-content",indentChar:"	",cssPath:"",cssData:"",minWidth:650,minHeight:100,minChangeSize:50,zIndex:811213,items:["source","|","undo","redo","|","preview","print","template","code","cut","copy","paste","plainpaste","wordpaste","|","justifyleft","justifycenter","justifyright","justifyfull","insertorderedlist","insertunorderedlist","indent","outdent","subscript","superscript","clearhtml","quickformat","selectall","|","fullscreen","/","formatblock","fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","strikethrough","lineheight","removeformat","|","image","multiimage","flash","media","insertfile","table","hr","emoticons","baidumap","pagebreak","anchor","link","unlink","|","about"],noDisableItems:["source","fullscreen"],colorTable:[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]],fontSizeTable:["9px","10px","12px","14px","16px","18px","24px","32px"],htmlTags:{font:["id","class","color","size","face",".background-color"],span:["id","class",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".line-height"],div:["id","class","align",".border",".margin",".padding",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".background",".font-style",".text-decoration",".vertical-align",".margin-left"],table:["id","class","border","cellspacing","cellpadding","width","height","align","bordercolor",".padding",".margin",".border","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".background",".width",".height",".border-collapse"],"td,th":["id","class","align","valign","width","height","colspan","rowspan","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".vertical-align",".background",".border"],a:["id","class","href","target","name"],embed:["id","class","src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess","wmode"],img:["id","class","src","width","height","border","alt","title","align",".width",".height",".border"],"p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":["id","class","align",".text-align",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".text-indent",".margin-left"],pre:["id","class"],hr:["id","class",".page-break-after"],"br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del":["id","class"],iframe:["id","class","src","frameborder","width","height",".width",".height"]},layout:'<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'};var _useCapture=!1,_INPUT_KEY_MAP=_toMap("8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222"),_CURSORMOVE_KEY_MAP=_toMap("33..40"),_CHANGE_KEY_MAP={};_each(_INPUT_KEY_MAP,function(a,b){_CHANGE_KEY_MAP[a]=b}),_each(_CURSORMOVE_KEY_MAP,function(a,b){_CHANGE_KEY_MAP[a]=b});var _EVENT_PROPS="altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which".split(",");_extend(KEvent,{init:function(a,b){var c=this,d=a.ownerDocument||a.document||a;if(c.event=b,_each(_EVENT_PROPS,function(a,d){c[d]=b[d]}),c.target||(c.target=c.srcElement||d),3===c.target.nodeType&&(c.target=c.target.parentNode),!c.relatedTarget&&c.fromElement&&(c.relatedTarget=c.fromElement===c.target?c.toElement:c.fromElement),null==c.pageX&&null!=c.clientX){var e=d.documentElement,f=d.body;c.pageX=c.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),c.pageY=c.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)}switch(!c.which&&(c.charCode||0===c.charCode?c.charCode:c.keyCode)&&(c.which=c.charCode||c.keyCode),!c.metaKey&&c.ctrlKey&&(c.metaKey=c.ctrlKey),c.which||c.button===undefined||(c.which=1&c.button?1:2&c.button?3:4&c.button?2:0),c.which){case 186:c.which=59;break;case 187:case 107:case 43:c.which=61;break;case 189:case 45:c.which=109;break;case 42:c.which=106;break;case 47:c.which=111;break;case 78:c.which=110}c.which>=96&&c.which<=105&&(c.which-=48)},preventDefault:function(){var a=this.event;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){var a=this.event;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},stop:function(){this.preventDefault(),this.stopPropagation()}});var _eventExpendo="kindeditor_"+_TIME,_eventId=0,_eventData={},_readyFinished=!1;window.attachEvent&&window.attachEvent("onunload",function(){_each(_eventData,function(a,b){b.el&&_unbind(b.el)})}),K.ctrl=_ctrl,K.ready=_ready,K.formatUrl=_formatUrl,K.formatHtml=_formatHtml,K.getCssList=_getCssList,K.getAttrList=_getAttrList,K.mediaType=_mediaType,K.mediaAttrs=_mediaAttrs,K.mediaEmbed=_mediaEmbed,K.mediaImg=_mediaImg,K.clearMsWord=_clearMsWord,K.tmpl=_tmpl;var _getSetAttrDiv=document.createElement("div");_getSetAttrDiv.setAttribute("className","t");var _GET_SET_ATTRIBUTE="t"!==_getSetAttrDiv.className;K.query=_query,K.queryAll=_queryAll,_extend(KNode,{init:function(a){var b=this;a=_isArray(a)?a:[a];for(var c=0,d=0,e=a.length;e>d;d++)a[d]&&(b[d]=a[d].constructor===KNode?a[d][0]:a[d],c++);b.length=c,b.doc=_getDoc(b[0]),b.name=_getNodeName(b[0]),b.type=b.length>0?b[0].nodeType:null,b.win=_getWin(b[0])},each:function(a){for(var b=this,c=0;c<b.length;c++)if(a.call(b[c],c,b[c])===!1)return b;return b},bind:function(a,b){return this.each(function(){_bind(this,a,b)}),this},unbind:function(a,b){return this.each(function(){_unbind(this,a,b)}),this},fire:function(a){return this.length<1?this:(_fire(this[0],a),this)},hasAttr:function(a){return this.length<1?!1:!!_getAttr(this[0],a)},attr:function(a,b){var c=this;return a===undefined?_getAttrList(c.outer()):"object"==typeof a?(_each(a,function(a,b){c.attr(a,b)}),c):b===undefined?(b=c.length<1?null:_getAttr(c[0],a),null===b?"":b):(c.each(function(){_setAttr(this,a,b)}),c)},removeAttr:function(a){return this.each(function(){_removeAttr(this,a)}),this},get:function(a){return this.length<1?null:this[a||0]},eq:function(a){return this.length<1?null:this[a]?new KNode(this[a]):null},hasClass:function(a){return this.length<1?!1:_hasClass(this[0],a)},addClass:function(a){return this.each(function(){_hasClass(this,a)||(this.className=_trim(this.className+" "+a))}),this},removeClass:function(a){return this.each(function(){_hasClass(this,a)&&(this.className=_trim(this.className.replace(new RegExp("(^|\\s)"+a+"(\\s|$)")," ")))}),this},html:function(a){var b=this;return a===undefined?b.length<1||1!=b.type?"":_formatHtml(b[0].innerHTML):(b.each(function(){_setHtml(this,a)}),b)},text:function(){var a=this;return a.length<1?"":_IE?a[0].innerText:a[0].textContent},hasVal:function(){return this.length<1?!1:_hasVal(this[0])},val:function(a){var b=this;return a===undefined?b.length<1?"":b.hasVal()?b[0].value:b.attr("value"):(b.each(function(){_hasVal(this)?this.value=a:_setAttr(this,"value",a)}),b)},css:function(a,b){var c=this;return a===undefined?_getCssList(c.attr("style")):"object"==typeof a?(_each(a,function(a,b){c.css(a,b)}),c):b===undefined?c.length<1?"":c[0].style[_toCamel(a)]||_computedCss(c[0],a)||"":(c.each(function(){this.style[_toCamel(a)]=b}),c)},width:function(a){var b=this;return a===undefined?b.length<1?0:b[0].offsetWidth:b.css("width",_addUnit(a))},height:function(a){var b=this;return a===undefined?b.length<1?0:b[0].offsetHeight:b.css("height",_addUnit(a))},opacity:function(a){return this.each(function(){this.style.opacity===undefined?this.style.filter=1==a?"":"alpha(opacity="+100*a+")":this.style.opacity=1==a?"":a}),this},data:function(a,b){var c=this;return a="kindeditor_data_"+a,b===undefined?c.length<1?null:c[0][a]:(this.each(function(){this[a]=b}),c)},pos:function(){var a=this,b=a[0],c=0,d=0;if(b)if(b.getBoundingClientRect){var e=b.getBoundingClientRect(),f=_getScrollPos(a.doc);c=e.left+f.x,d=e.top+f.y}else for(;b;)c+=b.offsetLeft,d+=b.offsetTop,b=b.offsetParent;return{x:_round(c),y:_round(d)}},clone:function(a){return new KNode(this.length<1?[]:this[0].cloneNode(a))},append:function(a){return this.each(function(){this.appendChild&&this.appendChild(_get(a))}),this},appendTo:function(a){return this.each(function(){_get(a).appendChild(this)}),this},before:function(a){return this.each(function(){this.parentNode.insertBefore(_get(a),this)}),this},after:function(a){return this.each(function(){this.nextSibling?this.parentNode.insertBefore(_get(a),this.nextSibling):this.parentNode.appendChild(_get(a))}),this},replaceWith:function(a){var b=[];return this.each(function(c,d){_unbind(d);var e=_get(a);d.parentNode.replaceChild(e,d),b.push(e)}),K(b)},empty:function(){var a=this;return a.each(function(a,b){for(var c=b.firstChild;c;){if(!b.parentNode)return;var d=c.nextSibling;c.parentNode.removeChild(c),c=d}}),a},remove:function(a){var b=this;return b.each(function(c,d){if(d.parentNode){if(_unbind(d),a)for(var e=d.firstChild;e;){var f=e.nextSibling;d.parentNode.insertBefore(e,d),e=f}d.parentNode.removeChild(d),delete b[c]}}),b.length=0,b},show:function(a){var b=this;return a===undefined&&(a=b._originDisplay||""),"none"!=b.css("display")?b:b.css("display",a)},hide:function(){var a=this;return a.length<1?a:(a._originDisplay=a[0].style.display,a.css("display","none"))},outer:function(){var a=this;if(a.length<1)return"";var b,c=a.doc.createElement("div");return c.appendChild(a[0].cloneNode(!0)),b=_formatHtml(c.innerHTML),c=null,b},isSingle:function(){return!!_SINGLE_TAG_MAP[this.name]},isInline:function(){return!!_INLINE_TAG_MAP[this.name]},isBlock:function(){return!!_BLOCK_TAG_MAP[this.name]},isStyle:function(){return!!_STYLE_TAG_MAP[this.name]},isControl:function(){return!!_CONTROL_TAG_MAP[this.name]},contains:function(a){return this.length<1?!1:_contains(this[0],_get(a))},parent:function(){if(this.length<1)return null;var a=this[0].parentNode;return a?new KNode(a):null},children:function(){if(this.length<1)return new KNode([]);for(var a=[],b=this[0].firstChild;b;)(3!=b.nodeType||""!==_trim(b.nodeValue))&&a.push(b),b=b.nextSibling;return new KNode(a)},first:function(){var a=this.children();return a.length>0?a.eq(0):null},last:function(){var a=this.children();return a.length>0?a.eq(a.length-1):null},index:function(){if(this.length<1)return-1;for(var a=-1,b=this[0];b;)a++,b=b.previousSibling;return a},prev:function(){if(this.length<1)return null;var a=this[0].previousSibling;return a?new KNode(a):null},next:function(){if(this.length<1)return null;var a=this[0].nextSibling;return a?new KNode(a):null},scan:function(a,b){function c(d){for(var e=b?d.firstChild:d.lastChild;e;){var f=b?e.nextSibling:e.previousSibling;if(a(e)===!1)return!1;if(c(e)===!1)return!1;e=f}}if(!(this.length<1))return b=b===undefined?!0:b,c(this[0]),this}}),_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){KNode.prototype[b]=function(a){return a?this.bind(b,a):this.fire(b)}});var _K=K;K=function(a,b){function c(a){return a[0]||(a=[]),new KNode(a)}if(a!==undefined&&null!==a){if("string"==typeof a){b&&(b=_get(b));var d=a.length;if("@"===a.charAt(0)&&(a=a.substr(1)),a.length!==d||/<.+>/.test(a)){var e=b?b.ownerDocument||b:document,f=e.createElement("div"),g=[];f.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+a;for(var h=0,i=f.childNodes.length;i>h;h++){var j=f.childNodes[h];"__kindeditor_temp_tag__"!=j.id&&g.push(j)}return c(g)}return c(_queryAll(a,b))}return a&&a.constructor===KNode?a:(a.toArray&&(a=a.toArray()),c(_isArray(a)?a:_toArray(arguments)))}},_each(_K,function(a,b){K[a]=b}),K.NodeClass=KNode,window.KindEditor=K;var _START_TO_START=0,_START_TO_END=1,_END_TO_END=2,_END_TO_START=3,_BOOKMARK_ID=0;_extend(KRange,{init:function(a){var b=this;b.startContainer=a,b.startOffset=0,b.endContainer=a,b.endOffset=0,b.collapsed=!0,b.doc=a},commonAncestor:function(){function a(a){for(var b=[];a;)b.push(a),a=a.parentNode;return b}for(var b,c,d=a(this.startContainer),e=a(this.endContainer),f=0,g=d.length,h=e.length;++f&&(b=d[g-f],c=e[h-f],b&&c&&b===c););return d[g-f+1]},setStart:function(a,b){var c=this,d=c.doc;return c.startContainer=a,c.startOffset=b,c.endContainer===d&&(c.endContainer=a,c.endOffset=b),_updateCollapsed(this)},setEnd:function(a,b){var c=this,d=c.doc;return c.endContainer=a,c.endOffset=b,c.startContainer===d&&(c.startContainer=a,c.startOffset=b),_updateCollapsed(this)},setStartBefore:function(a){return this.setStart(a.parentNode||this.doc,K(a).index())},setStartAfter:function(a){return this.setStart(a.parentNode||this.doc,K(a).index()+1)},setEndBefore:function(a){return this.setEnd(a.parentNode||this.doc,K(a).index())},setEndAfter:function(a){return this.setEnd(a.parentNode||this.doc,K(a).index()+1)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){var b=K(a);if(3==b.type||b.isSingle())return this.selectNode(a);var c=b.children();return c.length>0?this.setStartBefore(c[0]).setEndAfter(c[c.length-1]):this.setStart(a,0).setEnd(a,0)},collapse:function(a){return a?this.setEnd(this.startContainer,this.startOffset):this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(a,b){var c=this.get(),d=b.get();if(!_IERANGE)return c.compareBoundaryPoints(a,d);var e={};e[_START_TO_START]="StartToStart",e[_START_TO_END]="EndToStart",e[_END_TO_END]="EndToEnd",e[_END_TO_START]="StartToEnd";var f=c.compareEndPoints(e[a],d);if(0!==f)return f;var g,h,i,j,k;if((a===_START_TO_START||a===_END_TO_START)&&(g=this.startContainer,j=this.startOffset),(a===_START_TO_END||a===_END_TO_END)&&(g=this.endContainer,j=this.endOffset),(a===_START_TO_START||a===_START_TO_END)&&(h=b.startContainer,k=b.startOffset),(a===_END_TO_END||a===_END_TO_START)&&(h=b.endContainer,k=b.endOffset),g===h){var l=j-k;return l>0?1:0>l?-1:0}for(i=h;i&&i.parentNode!==g;)i=i.parentNode;if(i)return K(i).index()>=j?-1:1;for(i=g;i&&i.parentNode!==h;)i=i.parentNode;return i?K(i).index()>=k?1:-1:(i=K(h).next(),i&&i.contains(g)?1:(i=K(g).next(),i&&i.contains(h)?-1:void 0))},cloneRange:function(){return new KRange(this.doc).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,this.endOffset)},toString:function(){var a=this.get(),b=_IERANGE?a.text:a.toString();return b.replace(/\r\n|\n|\r/g,"")},cloneContents:function(){return _copyAndDelete(this,!0,!1)},deleteContents:function(){return _copyAndDelete(this,!1,!0)},extractContents:function(){return _copyAndDelete(this,!0,!0)},insertNode:function(a){var b,c,d,e=this,f=e.startContainer,g=e.startOffset,h=e.endContainer,i=e.endOffset,j=1;return"#document-fragment"===a.nodeName.toLowerCase()&&(b=a.firstChild,c=a.lastChild,j=a.childNodes.length),1==f.nodeType?(d=f.childNodes[g],d?(f.insertBefore(a,d),f===h&&(i+=j)):f.appendChild(a)):3==f.nodeType&&(0===g?(f.parentNode.insertBefore(a,f),f.parentNode===h&&(i+=j)):g>=f.nodeValue.length?f.nextSibling?f.parentNode.insertBefore(a,f.nextSibling):f.parentNode.appendChild(a):(d=g>0?f.splitText(g):f,f.parentNode.insertBefore(a,d),f===h&&(h=d,i-=g))),b?e.setStartBefore(b).setEndAfter(c):e.selectNode(a),e.compareBoundaryPoints(_END_TO_END,e.cloneRange().setEnd(h,i))>=1?e:e.setEnd(h,i)},surroundContents:function(a){return a.appendChild(this.extractContents()),this.insertNode(a).selectNode(a)},isControl:function(){var a=this,b=a.startContainer,c=a.startOffset,d=a.endContainer,e=a.endOffset;return 1==b.nodeType&&b===d&&c+1===e&&K(b.childNodes[c]).isControl()},get:function(a){var b,c=this,d=c.doc;if(!_IERANGE){b=d.createRange();try{b.setStart(c.startContainer,c.startOffset),b.setEnd(c.endContainer,c.endOffset)}catch(e){}return b}if(a&&c.isControl())return b=d.body.createControlRange(),b.addElement(c.startContainer.childNodes[c.startOffset]),b;var f=c.cloneRange().down();return b=d.body.createTextRange(),b.setEndPoint("StartToStart",_getEndRange(f.startContainer,f.startOffset)),b.setEndPoint("EndToStart",_getEndRange(f.endContainer,f.endOffset)),b},html:function(){return K(this.cloneContents()).outer()},down:function(){function a(a,c,d){if(1==a.nodeType){var e=K(a).children();if(0!==e.length){var f,g,h,i;c>0&&(f=e.eq(c-1)),c<e.length&&(g=e.eq(c)),f&&3==f.type&&(h=f[0],i=h.nodeValue.length),g&&3==g.type&&(h=g[0],i=0),h&&(d?b.setStart(h,i):b.setEnd(h,i))}}}var b=this;return a(b.startContainer,b.startOffset,!0),a(b.endContainer,b.endOffset,!1),b},up:function(){function a(a,c,d){3==a.nodeType&&(0===c?d?b.setStartBefore(a):b.setEndBefore(a):c==a.nodeValue.length&&(d?b.setStartAfter(a):b.setEndAfter(a)))}var b=this;return a(b.startContainer,b.startOffset,!0),a(b.endContainer,b.endOffset,!1),b},enlarge:function(a){function b(b,d,e){var f,g=K(b);if(!(3==g.type||_NOSPLIT_TAG_MAP[g.name]||!a&&g.isBlock()))if(0===d){for(;!g.prev()&&(f=g.parent(),f&&!_NOSPLIT_TAG_MAP[f.name]&&(a||!f.isBlock()));)g=f;e?c.setStartBefore(g[0]):c.setEndBefore(g[0])}else if(d==g.children().length){for(;!g.next()&&(f=g.parent(),f&&!_NOSPLIT_TAG_MAP[f.name]&&(a||!f.isBlock()));)g=f;e?c.setStartAfter(g[0]):c.setEndAfter(g[0])}}var c=this;return c.up(),b(c.startContainer,c.startOffset,!0),b(c.endContainer,c.endOffset,!1),c},shrink:function(){for(var a,b=this,c=b.collapsed;1==b.startContainer.nodeType&&(a=b.startContainer.childNodes[b.startOffset])&&1==a.nodeType&&!K(a).isSingle();)b.setStart(a,0);if(c)return b.collapse(c);for(;1==b.endContainer.nodeType&&b.endOffset>0&&(a=b.endContainer.childNodes[b.endOffset-1])&&1==a.nodeType&&!K(a).isSingle();)b.setEnd(a,a.childNodes.length);return b},createBookmark:function(a){var b,c=this,d=c.doc,e=K('<span style="display:none;"></span>',d)[0];return e.id="__kindeditor_bookmark_start_"+_BOOKMARK_ID++ +"__",c.collapsed||(b=e.cloneNode(!0),b.id="__kindeditor_bookmark_end_"+_BOOKMARK_ID++ +"__"),b&&c.cloneRange().collapse(!1).insertNode(b).setEndBefore(b),c.insertNode(e).setStartAfter(e),{start:a?"#"+e.id:e,end:b?a?"#"+b.id:b:null}},moveToBookmark:function(a){var b=this,c=b.doc,d=K(a.start,c),e=a.end?K(a.end,c):null;return!d||d.length<1?b:(b.setStartBefore(d[0]),d.remove(),e&&e.length>0?(b.setEndBefore(e[0]),e.remove()):b.collapse(!0),b)},dump:function(){console.log("--------------------"),console.log(3==this.startContainer.nodeType?this.startContainer.nodeValue:this.startContainer,this.startOffset),console.log(3==this.endContainer.nodeType?this.endContainer.nodeValue:this.endContainer,this.endOffset)}}),K.RangeClass=KRange,K.range=_range,K.START_TO_START=_START_TO_START,K.START_TO_END=_START_TO_END,K.END_TO_END=_END_TO_END,K.END_TO_START=_END_TO_START,_extend(KCmd,{init:function(a){var b=this,c=a.doc;b.doc=c,b.win=_getWin(c),b.sel=_getSel(c),b.range=a},selection:function(a){var b=this,c=b.doc,d=_getRng(c);return b.sel=_getSel(c),d?(b.range=_range(d),"html"==K(b.range.startContainer).name&&b.range.selectNodeContents(c.body).collapse(!1),b):(a&&b.range.selectNodeContents(c.body).collapse(!1),b)},select:function(a){a=_undef(a,!0);var b,c=this,d=c.sel,e=c.range.cloneRange().shrink(),f=e.startContainer,g=e.startOffset,h=(e.endContainer,e.endOffset,_getDoc(f)),i=c.win,j=!1;if(a&&1==f.nodeType&&e.collapsed){if(_IERANGE){var k=K("<span>&nbsp;</span>",h);e.insertNode(k[0]),b=h.body.createTextRange();try{b.moveToElementText(k[0])}catch(l){}return b.collapse(!1),b.select(),k.remove(),i.focus(),c}if(_WEBKIT){var m=f.childNodes;(K(f).isInline()||g>0&&K(m[g-1]).isInline()||m[g]&&K(m[g]).isInline())&&(e.insertNode(h.createTextNode("​")),j=!0)}}if(_IERANGE)try{b=e.get(!0),b.select()}catch(n){}else if(j&&e.collapse(!1),b=e.get(!0),d.removeAllRanges(),d.addRange(b),h!==document){var o=K(b.endContainer).pos();i.scrollTo(o.x,o.y)}return i.focus(),c},wrap:function(a){var b,c=this,d=c.doc,e=c.range;if(b=K(a,d),e.collapsed)return e.shrink(),e.insertNode(b[0]).selectNodeContents(b[0]),c;if(b.isBlock()){for(var f=b.clone(!0),g=f;g.first();)g=g.first();return g.append(e.extractContents()),e.insertNode(f[0]).selectNode(f[0]),c}e.enlarge();var h=e.createBookmark(),i=e.commonAncestor(),j=!1;return K(i).scan(function(a){if(!j&&a==h.start)return void(j=!0);if(j){if(a==h.end)return!1;var c=K(a);if(_inPreElement(c))return;if(3==c.type&&_trim(a.nodeValue).length>0){for(var d;(d=c.parent())&&d.isStyle()&&1==d.children().length;)c=d;_wrapNode(c,b)}}}),e.moveToBookmark(h),c},split:function(a,b){for(var c,d=this.range,e=d.doc,f=d.cloneRange().collapse(a),g=f.startContainer,h=f.startOffset,i=3==g.nodeType?g.parentNode:g,j=!1;i&&i.parentNode;){if(c=K(i),b){if(!c.isStyle())break;if(!_hasAttrOrCss(c,b))break}else if(_NOSPLIT_TAG_MAP[c.name])break;j=!0,i=i.parentNode}if(j){var k=e.createElement("span");d.cloneRange().collapse(!a).insertNode(k),a?f.setStartBefore(i.firstChild).setEnd(g,h):f.setStart(g,h).setEndAfter(i.lastChild);var l=f.extractContents(),m=l.firstChild,n=l.lastChild;a?(f.insertNode(l),d.setStartAfter(n).setEndBefore(k)):(i.appendChild(l),d.setStartBefore(k).setEndBefore(m));var o=k.parentNode;if(o==d.endContainer){var p=K(k).prev(),q=K(k).next();p&&q&&3==p.type&&3==q.type?d.setEnd(p[0],p[0].nodeValue.length):a||d.setEnd(d.endContainer,d.endOffset-1)}o.removeChild(k)}return this},remove:function(a){var b=this,c=b.doc,d=b.range;if(d.enlarge(),0===d.startOffset){for(var e,f=K(d.startContainer);(e=f.parent())&&e.isStyle()&&1==e.children().length;)f=e;d.setStart(f[0],0),f=K(d.startContainer),f.isBlock()&&_removeAttrOrCss(f,a);var g=f.parent();g&&g.isBlock()&&_removeAttrOrCss(g,a)}var h,i;if(d.collapsed){if(b.split(!0,a),h=d.startContainer,i=d.startOffset,i>0){var j=K(h.childNodes[i-1]);j&&_isEmptyNode(j)&&(j.remove(),d.setStart(h,i-1))}var k=K(h.childNodes[i]);return k&&_isEmptyNode(k)&&k.remove(),_isEmptyNode(h)&&(d.startBefore(h),h.remove()),d.collapse(!0),b}b.split(!0,a),b.split(!1,a);var l=c.createElement("span"),m=c.createElement("span");d.cloneRange().collapse(!1).insertNode(m),d.cloneRange().collapse(!0).insertNode(l);var n=[],o=!1;K(d.commonAncestor()).scan(function(a){return o||a!=l?a==m?!1:void(o&&n.push(a)):void(o=!0)}),K(l).remove(),K(m).remove(),h=d.startContainer,i=d.startOffset;var p=d.endContainer,q=d.endOffset;if(i>0){var r=K(h.childNodes[i-1]);r&&_isEmptyNode(r)&&(r.remove(),d.setStart(h,i-1),h==p&&d.setEnd(p,q-1));var s=K(h.childNodes[i]);s&&_isEmptyNode(s)&&(s.remove(),h==p&&d.setEnd(p,q-1))}var t=K(p.childNodes[d.endOffset]);t&&_isEmptyNode(t)&&t.remove();var u=d.createBookmark(!0);return _each(n,function(b,c){_removeAttrOrCss(K(c),a)}),d.moveToBookmark(u),b},commonNode:function(a){function b(b){for(var c=b,d=b;d;){if(_hasAttrOrCss(K(d),a))return K(d);d=d.parentNode}for(;c&&(c=c.lastChild);)if(_hasAttrOrCss(K(c),a))return K(c);return null}var c=this.range,d=c.endContainer,e=c.endOffset,f=3==d.nodeType||0===e?d:d.childNodes[e-1],g=b(f);if(g)return g;if(1==f.nodeType||3==d.nodeType&&0===e){var h=K(f).prev();if(h)return b(h)}return null},commonAncestor:function(a){function b(b){for(;b;){if(1==b.nodeType&&b.tagName.toLowerCase()===a)return b;b=b.parentNode}return null}var c=this.range,d=c.startContainer,e=c.startOffset,f=c.endContainer,g=c.endOffset,h=3==d.nodeType||0===e?d:d.childNodes[e-1],i=3==f.nodeType||0===g?f:f.childNodes[g-1],j=b(h),k=b(i);return j&&k&&j===k?K(j):null},state:function(a){var b=this,c=b.doc,d=!1;try{d=c.queryCommandState(a)}catch(e){}return d},val:function(a){function b(a){return a.toLowerCase()}{var c=this,d=c.doc;c.range}a=b(a);var e,f="";return"fontfamily"===a||"fontname"===a?(f=_nativeCommandValue(d,"fontname"),f=f.replace(/['"]/g,""),b(f)):"formatblock"===a?(f=_nativeCommandValue(d,a),""===f&&(e=c.commonNode({"h1,h2,h3,h4,h5,h6,p,div,pre,address":"*"}),e&&(f=e.name)),"Normal"===f&&(f="p"),b(f)):"fontsize"===a?(e=c.commonNode({"*":".font-size"}),e&&(f=e.css("font-size")),b(f)):"forecolor"===a?(e=c.commonNode({"*":".color"}),e&&(f=e.css("color")),f=_toHex(f),""===f&&(f="default"),b(f)):"hilitecolor"===a?(e=c.commonNode({"*":".background-color"}),e&&(f=e.css("background-color")),f=_toHex(f),""===f&&(f="default"),b(f)):f},toggle:function(a,b){var c=this;return c.commonNode(b)?c.remove(b):c.wrap(a),c.select()},bold:function(){return this.toggle("<strong></strong>",{span:".font-weight=bold",strong:"*",b:"*"})},italic:function(){return this.toggle("<em></em>",{span:".font-style=italic",em:"*",i:"*"})},underline:function(){return this.toggle("<u></u>",{span:".text-decoration=underline",u:"*"})},strikethrough:function(){return this.toggle("<s></s>",{span:".text-decoration=line-through",s:"*"})},forecolor:function(a){return this.wrap('<span style="color:'+a+';"></span>').select()},hilitecolor:function(a){return this.wrap('<span style="background-color:'+a+';"></span>').select()},fontsize:function(a){return this.wrap('<span style="font-size:'+a+';"></span>').select()},fontname:function(a){return this.fontfamily(a)},fontfamily:function(a){return this.wrap('<span style="font-family:'+a+';"></span>').select()},removeformat:function(){var a={"*":".font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent"},b=_STYLE_TAG_MAP;return _each(b,function(b){a[b]="*"}),this.remove(a),this.select()},inserthtml:function(a,b){function c(a,b){b='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b;var c=a.get();c.item?c.item(0).outerHTML=b:c.pasteHTML(b);var d=a.doc.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d);var f=_toRange(c);a.setEnd(f.endContainer,f.endOffset),a.collapse(!1),e.select(!1)}function d(a,b){var c=a.doc,d=c.createDocumentFragment();K("@"+b,c).each(function(){d.appendChild(this)}),a.deleteContents(),a.insertNode(d),a.collapse(!1),e.select(!1)}var e=this,f=e.range;if(""===a)return e;if(_IERANGE&&b){try{c(f,a)}catch(g){d(f,a)}return e}return d(f,a),e},hr:function(){return this.inserthtml("<hr />")},print:function(){return this.win.print(),this},insertimage:function(a,b,c,d,e,f){b=_undef(b,""),e=_undef(e,0);var g='<img src="'+_escape(a)+'" data-ke-src="'+_escape(a)+'" ';return c&&(g+='width="'+_escape(c)+'" '),d&&(g+='height="'+_escape(d)+'" '),b&&(g+='title="'+_escape(b)+'" '),f&&(g+='align="'+_escape(f)+'" '),g+='alt="'+_escape(b)+'" ',g+="/>",this.inserthtml(g)},createlink:function(a,b){function c(a,b,c){K(a).attr("href",b).attr("data-ke-src",b),c?K(a).attr("target",c):K(a).removeAttr("target")}var d=this,e=d.doc,f=d.range;d.select();var g=d.commonNode({a:"*"});g&&!f.isControl()&&(f.selectNode(g.get()),d.select());var h='<a href="'+_escape(a)+'" data-ke-src="'+_escape(a)+'" ';if(b&&(h+=' target="'+_escape(b)+'"'),f.collapsed)return h+=">"+_escape(a)+"</a>",d.inserthtml(h);if(f.isControl()){var i=K(f.startContainer.childNodes[f.startOffset]);return h+="></a>",i.after(K(h,e)),i.next().append(i),f.selectNode(i[0]),d.select()}var j=f.startContainer,k=f.startOffset,l=f.endContainer,m=f.endOffset;if(1==j.nodeType&&j===l&&k+1===m){var n=j.childNodes[k];if("a"==n.nodeName.toLowerCase())return c(n,a,b),d
+}return _nativeCommand(e,"createlink","__kindeditor_temp_url__"),K('a[href="__kindeditor_temp_url__"]',e).each(function(){c(this,a,b)}),d},unlink:function(){var a=this,b=a.doc,c=a.range;if(a.select(),c.collapsed){var d=a.commonNode({a:"*"});if(d&&(c.selectNode(d.get()),a.select()),_nativeCommand(b,"unlink",null),_WEBKIT&&"img"===K(c.startContainer).name){var e=K(c.startContainer).parent();"a"===e.name&&e.remove(!0)}}else _nativeCommand(b,"unlink",null);return a}}),_each("formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript".split(","),function(a,b){KCmd.prototype[b]=function(a){var c=this;return c.select(),_nativeCommand(c.doc,b,a),_IERANGE&&_inArray(b,"justifyleft,justifycenter,justifyright,justifyfull".split(","))>=0&&c.selection(),(!_IERANGE||_inArray(b,"formatblock,selectall,insertorderedlist,insertunorderedlist".split(","))>=0)&&c.selection(),c}}),_each("cut,copy,paste".split(","),function(a,b){KCmd.prototype[b]=function(){var a=this;if(!a.doc.queryCommandSupported(b))throw"not supported";return a.select(),_nativeCommand(a.doc,b,null),a}}),K.CmdClass=KCmd,K.cmd=_cmd,_extend(KWidget,{init:function(a){var b=this;if(b.name=a.name||"",b.doc=a.doc||document,b.win=_getWin(b.doc),b.x=_addUnit(a.x),b.y=_addUnit(a.y),b.z=a.z,b.width=_addUnit(a.width),b.height=_addUnit(a.height),b.div=K('<div style="display:block;"></div>'),b.options=a,b._alignEl=a.alignEl,b.width&&b.div.css("width",b.width),b.height&&b.div.css("height",b.height),b.z&&b.div.css({position:"absolute",left:b.x,top:b.y,"z-index":b.z}),!b.z||b.x!==undefined&&b.y!==undefined||b.autoPos(b.width,b.height),a.cls&&b.div.addClass(a.cls),a.shadowMode&&b.div.addClass("ke-shadow"),a.css&&b.div.css(a.css),a.src?K(a.src).replaceWith(b.div):K(b.doc.body).append(b.div),a.html&&b.div.html(a.html),a.autoScroll)if(_IE&&7>_V||_QUIRKS){var c=_getScrollPos();K(b.win).bind("scroll",function(){var a=_getScrollPos(),d=a.x-c.x,e=a.y-c.y;b.pos(_removeUnit(b.x)+d,_removeUnit(b.y)+e,!1)})}else b.div.css("position","fixed")},pos:function(a,b,c){var d=this;return c=_undef(c,!0),null!==a&&(a=0>a?0:_addUnit(a),d.div.css("left",a),c&&(d.x=a)),null!==b&&(b=0>b?0:_addUnit(b),d.div.css("top",b),c&&(d.y=b)),d},autoPos:function(a,b){var c=this,d=_removeUnit(a)||0,e=_removeUnit(b)||0,f=_getScrollPos();if(c._alignEl){var g=K(c._alignEl),h=g.pos(),i=_round(g[0].clientWidth/2-d/2),j=_round(g[0].clientHeight/2-e/2);x=0>i?h.x:h.x+i,y=0>j?h.y:h.y+j}else{var k=_docElement(c.doc);x=_round(f.x+(k.clientWidth-d)/2),y=_round(f.y+(k.clientHeight-e)/2)}return _IE&&7>_V||_QUIRKS||(x-=f.x,y-=f.y),c.pos(x,y)},remove:function(){var a=this;return(_IE&&7>_V||_QUIRKS)&&K(a.win).unbind("scroll"),a.div.remove(),_each(a,function(b){a[b]=null}),this},show:function(){return this.div.show(),this},hide:function(){return this.div.hide(),this},draggable:function(a){var b=this;return a=a||{},a.moveEl=b.div,a.moveFn=function(a,c,d,e,f,g){(a+=f)<0&&(a=0),(c+=g)<0&&(c=0),b.pos(a,c)},_drag(a),b}}),K.WidgetClass=KWidget,K.widget=_widget;var html,_direction="";(html=document.getElementsByTagName("html"))&&(_direction=html[0].dir),_extend(KEdit,KWidget,{init:function(a){function b(){var b=_iframeDoc(c.iframe);b.open(),h&&(b.domain=document.domain),b.write(_getInitHtml(d,e,f,g)),b.close(),c.win=c.iframe[0].contentWindow,c.doc=b;var i=_cmd(b);c.afterChange(function(){i.selection()}),_WEBKIT&&K(b).click(function(a){"img"===K(a.target).name&&(i.selection(!0),i.range.selectNode(a.target),i.select())}),_IE&&(c._mousedownHandler=function(){var a=i.range.cloneRange();a.shrink(),a.isControl()&&c.blur()},K(document).mousedown(c._mousedownHandler),K(b).keydown(function(a){if(8==a.which){i.selection();var b=i.range;b.isControl()&&(b.collapse(!0),K(b.startContainer.childNodes[b.startOffset]).remove(),a.preventDefault())}})),c.cmd=i,c.html(_elementVal(c.srcElement)),_IE?(b.body.disabled=!0,b.body.contentEditable=!0,b.body.removeAttribute("disabled")):b.designMode="on",a.afterCreate&&a.afterCreate.call(c)}var c=this;KEdit.parent.init.call(c,a),c.srcElement=K(a.srcElement),c.div.addClass("ke-edit"),c.designMode=_undef(a.designMode,!0),c.beforeGetHtml=a.beforeGetHtml,c.beforeSetHtml=a.beforeSetHtml,c.afterSetHtml=a.afterSetHtml;var d=_undef(a.themesPath,""),e=a.bodyClass,f=a.cssPath,g=a.cssData,h="res:"!=location.protocol&&location.host.replace(/:\d+/,"")!==document.domain,i="document.open();"+(h?'document.domain="'+document.domain+'";':"")+"document.close();",j=_IE?' src="javascript:void(function(){'+encodeURIComponent(i)+'}())"':"";c.iframe=K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"'+j+"></iframe>").css("width","100%"),c.textarea=K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css("width","100%"),c.tabIndex=isNaN(parseInt(a.tabIndex,10))?c.srcElement.attr("tabindex"):parseInt(a.tabIndex,10),c.iframe.attr("tabindex",c.tabIndex),c.textarea.attr("tabindex",c.tabIndex),c.width&&c.setWidth(c.width),c.height&&c.setHeight(c.height),c.designMode?c.textarea.hide():c.iframe.hide(),h&&c.iframe.bind("load",function(){c.iframe.unbind("load"),_IE?b():setTimeout(b,0)}),c.div.append(c.iframe),c.div.append(c.textarea),c.srcElement.hide(),!h&&b()},setWidth:function(a){var b=this;return a=_addUnit(a),b.width=a,b.div.css("width",a),b},setHeight:function(a){var b=this;return a=_addUnit(a),b.height=a,b.div.css("height",a),b.iframe.css("height",a),(_IE&&8>_V||_QUIRKS)&&(a=_addUnit(_removeUnit(a)-2)),b.textarea.css("height",a),b},remove:function(){var a=this,b=a.doc;K(b.body).unbind(),K(b).unbind(),K(a.win).unbind(),a._mousedownHandler&&K(document).unbind("mousedown",a._mousedownHandler),_elementVal(a.srcElement,a.html()),a.srcElement.show(),a.iframe.unbind(),a.textarea.unbind(),KEdit.parent.remove.call(a)},html:function(a,b){var c=this,d=c.doc;if(c.designMode){var e=d.body;return a===undefined?(a=b?"<!doctype html><html>"+e.parentNode.innerHTML+"</html>":e.innerHTML,c.beforeGetHtml&&(a=c.beforeGetHtml(a)),_GECKO&&"<br />"==a&&(a=""),a):(c.beforeSetHtml&&(a=c.beforeSetHtml(a)),_IE&&_V>=9&&(a=a.replace(/(<.*?checked=")checked(".*>)/gi,"$1$2")),K(e).html(a),c.afterSetHtml&&c.afterSetHtml(),c)}return a===undefined?c.textarea.val():(c.textarea.val(a),c)},design:function(a){var b,c=this;if(a===undefined?!c.designMode:a){if(!c.designMode){b=c.html(),c.designMode=!0,c.textarea.hide(),c.html(b);var d=c.iframe,e=_removeUnit(c.height);d.height(e-2),d.show(),setTimeout(function(){d.height(e)},0)}}else c.designMode&&(b=c.html(),c.designMode=!1,c.html(b),c.iframe.hide(),c.textarea.show());return c.focus()},focus:function(){var a=this;return a.designMode?a.win.focus():a.textarea[0].focus(),a},blur:function(){var a=this;if(_IE){var b=K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />',a.div);a.div.append(b),b[0].focus(),b.remove()}else a.designMode?a.win.blur():a.textarea[0].blur();return a},afterChange:function(a){function b(b){setTimeout(function(){a(b)},1)}var c=this,d=c.doc,e=d.body;return K(d).keyup(function(b){b.ctrlKey||b.altKey||!_CHANGE_KEY_MAP[b.which]||a(b)}),K(d).mouseup(a).contextmenu(a),K(c.win).blur(a),K(e).bind("paste",b),K(e).bind("cut",b),c}}),K.EditClass=KEdit,K.edit=_edit,K.iframeDoc=_iframeDoc,_extend(KToolbar,KWidget,{init:function(a){function b(a){var b=K(a);return b.hasClass("ke-outline")?b:b.hasClass("ke-toolbar-icon")?b.parent():void 0}function c(a,c){var d=b(a.target);if(d){if(d.hasClass("ke-disabled"))return;if(d.hasClass("ke-selected"))return;d[c]("ke-on")}}var d=this;KToolbar.parent.init.call(d,a),d.disableMode=_undef(a.disableMode,!1),d.noDisableItemMap=_toMap(_undef(a.noDisableItems,[])),d._itemMap={},d.div.addClass("ke-toolbar").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()}).attr("unselectable","on"),d.div.mouseover(function(a){c(a,"addClass")}).mouseout(function(a){c(a,"removeClass")}).click(function(a){var c=b(a.target);if(c){if(c.hasClass("ke-disabled"))return;d.options.click.call(this,a,c.attr("data-name"))}})},get:function(a){return this._itemMap[a]?this._itemMap[a]:this._itemMap[a]=K("span.ke-icon-"+a,this.div).parent()},select:function(a){return _selectToolbar.call(this,a,function(a){a.addClass("ke-selected")}),self},unselect:function(a){return _selectToolbar.call(this,a,function(a){a.removeClass("ke-selected").removeClass("ke-on")}),self},enable:function(a){var b=this,c=a.get?a:b.get(a);return c&&(c.removeClass("ke-disabled"),c.opacity(1)),b},disable:function(a){var b=this,c=a.get?a:b.get(a);return c&&(c.removeClass("ke-selected").addClass("ke-disabled"),c.opacity(.5)),b},disableAll:function(a,b){var c=this,d=c.noDisableItemMap;return b&&(d=_toMap(b)),(a===undefined?!c.disableMode:a)?(K("span.ke-outline",c.div).each(function(){var a=K(this),b=a[0].getAttribute("data-name",2);d[b]||c.disable(a)}),c.disableMode=!0):(K("span.ke-outline",c.div).each(function(){var a=K(this),b=a[0].getAttribute("data-name",2);d[b]||c.enable(a)}),c.disableMode=!1),c}}),K.ToolbarClass=KToolbar,K.toolbar=_toolbar,_extend(KMenu,KWidget,{init:function(a){var b=this;a.z=a.z||811213,KMenu.parent.init.call(b,a),b.centerLineMode=_undef(a.centerLineMode,!0),b.div.addClass("ke-menu").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on")},addItem:function(a){var b=this;if("-"===a.title)return void b.div.append(K('<div class="ke-menu-separator"></div>'));var c=K('<div class="ke-menu-item" unselectable="on"></div>'),d=K('<div class="ke-inline-block ke-menu-item-left"></div>'),e=K('<div class="ke-inline-block ke-menu-item-right"></div>'),f=_addUnit(a.height),g=_undef(a.iconClass,"");b.div.append(c),f&&(c.css("height",f),e.css("line-height",f));var h;return b.centerLineMode&&(h=K('<div class="ke-inline-block ke-menu-item-center"></div>'),f&&h.css("height",f)),c.mouseover(function(){K(this).addClass("ke-menu-item-on"),h&&h.addClass("ke-menu-item-center-on")}).mouseout(function(){K(this).removeClass("ke-menu-item-on"),h&&h.removeClass("ke-menu-item-center-on")}).click(function(b){a.click.call(K(this)),b.stopPropagation()}).append(d),h&&c.append(h),c.append(e),a.checked&&(g="ke-icon-checked"),""!==g&&d.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url '+g+'"></span>'),e.html(a.title),b},remove:function(){var a=this;return a.options.beforeRemove&&a.options.beforeRemove.call(a),K(".ke-menu-item",a.div[0]).unbind(),KMenu.parent.remove.call(a),a}}),K.MenuClass=KMenu,K.menu=_menu,_extend(KColorPicker,KWidget,{init:function(a){var b=this;a.z=a.z||811213,KColorPicker.parent.init.call(b,a);var c=a.colors||[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]];b.selectedColor=(a.selectedColor||"").toLowerCase(),b._cells=[],b.div.addClass("ke-colorpicker").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on");var d=b.doc.createElement("table");b.div.append(d),d.className="ke-colorpicker-table",d.cellPadding=0,d.cellSpacing=0,d.border=0;var e=d.insertRow(0),f=e.insertCell(0);f.colSpan=c[0].length,b._addAttr(f,"","ke-colorpicker-cell-top");for(var g=0;g<c.length;g++){e=d.insertRow(g+1);for(var h=0;h<c[g].length;h++)f=e.insertCell(h),b._addAttr(f,c[g][h],"ke-colorpicker-cell")}},_addAttr:function(a,b,c){var d=this;a=K(a).addClass(c),d.selectedColor===b.toLowerCase()&&a.addClass("ke-colorpicker-cell-selected"),a.attr("title",b||d.options.noColor),a.mouseover(function(){K(this).addClass("ke-colorpicker-cell-on")}),a.mouseout(function(){K(this).removeClass("ke-colorpicker-cell-on")}),a.click(function(a){a.stop(),d.options.click.call(K(this),b)}),b?a.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css("background-color",b)):a.html(d.options.noColor),K(a).attr("unselectable","on"),d._cells.push(a)},remove:function(){var a=this;return _each(a._cells,function(){this.unbind()}),KColorPicker.parent.remove.call(a),a}}),K.ColorPickerClass=KColorPicker,K.colorpicker=_colorpicker,_extend(KUploadButton,{init:function(a){var b=this,c=K(a.button),d=a.fieldName||"file",e=a.url||"",f=c.val(),g=a.extraParams||{},h=c[0].className||"",i=a.target||"kindeditor_upload_iframe_"+(new Date).getTime();a.afterError=a.afterError||function(a){alert(a)};var j=[];for(var k in g)j.push('<input type="hidden" name="'+k+'" value="'+g[k]+'" />');var l=['<div class="ke-inline-block '+h+'">',a.target?"":'<iframe name="'+i+'" style="display:none;"></iframe>',a.form?'<div class="ke-upload-area">':'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+i+'" action="'+e+'">','<span class="ke-button-common">',j.join(""),'<input type="button" class="ke-button-common ke-button" value="'+f+'" />',"</span>",'<input type="file" class="ke-upload-file" name="'+d+'" tabindex="-1" />',a.form?"</div>":"</form>","</div>"].join(""),m=K(l,c.doc);c.hide(),c.before(m),b.div=m,b.button=c,b.iframe=a.target?K('iframe[name="'+i+'"]'):K("iframe",m),b.form=a.form?K(a.form):K("form",m),b.fileBox=K(".ke-upload-file",m);var n=a.width||K(".ke-button-common",m).width();K(".ke-upload-area",m).width(n),b.options=a},submit:function(){var a=this,b=a.iframe;return b.bind("load",function(){b.unbind();var c=document.createElement("form");a.fileBox.before(c),K(c).append(a.fileBox),c.reset(),K(c).remove(!0);var d,e=K.iframeDoc(b),f=e.getElementsByTagName("pre")[0],g="";g=f?f.innerHTML:e.body.innerHTML,g=_unescape(g),b[0].src="javascript:false";try{d=K.json(g)}catch(h){a.options.afterError.call(a,"<!doctype html><html>"+e.body.parentNode.innerHTML+"</html>")}d&&a.options.afterUpload.call(a,d)}),a.form[0].submit(),a},remove:function(){var a=this;return a.fileBox&&a.fileBox.unbind(),a.iframe.remove(),a.div.remove(),a.button.show(),a}}),K.UploadButtonClass=KUploadButton,K.uploadbutton=_uploadbutton,_extend(KDialog,KWidget,{init:function(a){var b=this,c=_undef(a.shadowMode,!0);a.z=a.z||811213,a.shadowMode=!1,a.autoScroll=_undef(a.autoScroll,!0),KDialog.parent.init.call(b,a);var d=a.title,e=K(a.body,b.doc),f=a.previewBtn,g=a.yesBtn,h=a.noBtn,i=a.closeBtn,j=_undef(a.showMask,!0);b.div.addClass("ke-dialog").bind("click,mousedown",function(a){a.stopPropagation()});var k=K('<div class="ke-dialog-content"></div>').appendTo(b.div);_IE&&7>_V?b.iframeMask=K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(b.div):c&&K('<div class="ke-dialog-shadow"></div>').appendTo(b.div);var l=K('<div class="ke-dialog-header"></div>');k.append(l),l.html(d),b.closeIcon=K('<span class="ke-dialog-icon-close" title="'+i.name+'"></span>').click(i.click),l.append(b.closeIcon),b.draggable({clickEl:l,beforeDrag:a.beforeDrag});var m=K('<div class="ke-dialog-body"></div>');k.append(m),m.append(e);var n=K('<div class="ke-dialog-footer"></div>');if((f||g||h)&&k.append(n),_each([{btn:f,name:"preview"},{btn:g,name:"yes"},{btn:h,name:"no"}],function(){if(this.btn){var a=_createButton(this.btn);a.addClass("ke-dialog-"+this.name),n.append(a)}}),b.height&&m.height(_removeUnit(b.height)-l.height()-n.height()),b.div.width(b.div.width()),b.div.height(b.div.height()),b.mask=null,j){var o=_docElement(b.doc),p=Math.max(o.scrollWidth,o.clientWidth),q=Math.max(o.scrollHeight,o.clientHeight);b.mask=_widget({x:0,y:0,z:b.z-1,cls:"ke-dialog-mask",width:p,height:q})}b.autoPos(b.div.width(),b.div.height()),b.footerDiv=n,b.bodyDiv=m,b.headerDiv=l,b.isLoading=!1},setMaskIndex:function(a){var b=this;b.mask.div.css("z-index",a)},showLoading:function(a){a=_undef(a,"");var b=this,c=b.bodyDiv;return b.loading=K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:'+Math.round(c.height()/3)+'px;">'+a+"</div></div>").width(c.width()).height(c.height()).css("top",b.headerDiv.height()+"px"),c.css("visibility","hidden").after(b.loading),b.isLoading=!0,b},hideLoading:function(){return this.loading&&this.loading.remove(),this.bodyDiv.css("visibility","visible"),this.isLoading=!1,this},remove:function(){var a=this;return a.options.beforeRemove&&a.options.beforeRemove.call(a),a.mask&&a.mask.remove(),a.iframeMask&&a.iframeMask.remove(),a.closeIcon.unbind(),K("input",a.div).unbind(),K("button",a.div).unbind(),a.footerDiv.unbind(),a.bodyDiv.unbind(),a.headerDiv.unbind(),K("iframe",a.div).each(function(){K(this).remove()}),KDialog.parent.remove.call(a),a}}),K.DialogClass=KDialog,K.dialog=_dialog,K.tabs=_tabs,K.loadScript=_loadScript,K.loadStyle=_loadStyle,K.ajax=_ajax;var _plugins={},_language={};KEditor.prototype={lang:function(a){return _lang(a,this.langType)},loadPlugin:function(a,b){var c=this,d=this._pluginStatus;return d||(d=this._pluginStatus={}),_plugins[a]?_isFunction(_plugins[a])?(d[a]||(_plugins[a].call(c,KindEditor),d[a]="inited"),b&&b.call(c),c):(setTimeout(function(){c.loadPlugin(a,b)},100),c):(_plugins[a]="loading",_loadScript(c.pluginsPath+a+"/"+a+".js?ver="+encodeURIComponent(K.DEBUG?_TIME:_VERSION),function(){setTimeout(function(){_plugins[a]&&c.loadPlugin(a,b)},0)}),c)},handler:function(a,b){var c=this;return c._handlers[a]||(c._handlers[a]=[]),_isFunction(b)?(c._handlers[a].push(b),c):(_each(c._handlers[a],function(){b=this.call(c,b)}),b)},clickToolbar:function(a,b){var c=this,d="clickToolbar"+a;return b===undefined?c._handlers[d]?c.handler(d):(c.loadPlugin(a,function(){c.handler(d)}),c):c.handler(d,b)},updateState:function(){var a=this;return _each("justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,subscript,superscript,bold,italic,underline,strikethrough".split(","),function(b,c){a.cmd.state(c)?a.toolbar.select(c):a.toolbar.unselect(c)}),a},addContextmenu:function(a){return this._contextmenus.push(a),this},afterCreate:function(a){return this.handler("afterCreate",a)},beforeRemove:function(a){return this.handler("beforeRemove",a)},beforeGetHtml:function(a){return this.handler("beforeGetHtml",a)},beforeSetHtml:function(a){return this.handler("beforeSetHtml",a)},afterSetHtml:function(a){return this.handler("afterSetHtml",a)},create:function(){function a(){return 0===i.height()?void setTimeout(a,100):void b.resize(d,e,!1)}var b=this,c=b.fullscreenMode;if(b.isCreated)return b;if(b.srcElement.data("kindeditor"))return b;b.srcElement.data("kindeditor","true"),_docElement().style.overflow=c?"hidden":"";var d=c?_docElement().clientWidth+"px":b.width,e=c?_docElement().clientHeight+"px":b.height;(_IE&&8>_V||_QUIRKS)&&(e=_addUnit(_removeUnit(e)+2));var f=b.container=K(b.layout);c?K(document.body).append(f):b.srcElement.before(f);var g=K(".toolbar",f),h=K(".edit",f),i=b.statusbar=K(".statusbar",f);f.removeClass("container").addClass("ke-container ke-container-"+b.themeType).css("width",d),c?(f.css({position:"absolute",left:0,top:0,"z-index":811211}),_GECKO||(b._scrollPos=_getScrollPos()),window.scrollTo(0,0),K(document.body).css({height:"1px",overflow:"hidden"}),K(document.body.parentNode).css("overflow","hidden"),b._fullscreenExecuted=!0):(b._fullscreenExecuted&&(K(document.body).css({height:"",overflow:""}),K(document.body.parentNode).css("overflow","")),b._scrollPos&&window.scrollTo(b._scrollPos.x,b._scrollPos.y));var j=[];K.each(b.items,function(a,c){"|"==c?j.push('<span class="ke-inline-block ke-separator"></span>'):"/"==c?j.push('<div class="ke-hr"></div>'):(j.push('<span class="ke-outline" data-name="'+c+'" title="'+b.lang(c)+'" unselectable="on">'),j.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-'+c+'" unselectable="on"></span></span>'))});var k=b.toolbar=_toolbar({src:g,html:j.join(""),noDisableItems:b.noDisableItems,click:function(a,c){if(a.stop(),b.menu){var d=b.menu.name;if(b.hideMenu(),d===c)return}b.clickToolbar(c)}}),l=_removeUnit(e)-k.div.height(),m=b.edit=_edit({height:l>0&&_removeUnit(e)>b.minHeight?l:b.minHeight,src:h,srcElement:b.srcElement,designMode:b.designMode,themesPath:b.themesPath,bodyClass:b.bodyClass,cssPath:b.cssPath,cssData:b.cssData,beforeGetHtml:function(a){return a=b.beforeGetHtml(a),a=_removeBookmarkTag(_removeTempTag(a)),_formatHtml(a,b.filterMode?b.htmlTags:null,b.urlType,b.wellFormatMode,b.indentChar)},beforeSetHtml:function(a){return a=_formatHtml(a,b.filterMode?b.htmlTags:null,"",!1),b.beforeSetHtml(a)},afterSetHtml:function(){b.edit=m=this,b.afterSetHtml()},afterCreate:function(){if(b.edit=m=this,b.cmd=m.cmd,b._docMousedownFn=function(){b.menu&&b.hideMenu()},K(m.doc,document).mousedown(b._docMousedownFn),_bindContextmenuEvent.call(b),_bindNewlineEvent.call(b),_bindTabEvent.call(b),_bindFocusEvent.call(b),m.afterChange(function(){m.designMode&&(b.updateState(),b.addBookmark(),b.options.afterChange&&b.options.afterChange.call(b))}),m.textarea.keyup(function(a){a.ctrlKey||a.altKey||!_INPUT_KEY_MAP[a.which]||b.options.afterChange&&b.options.afterChange.call(b)}),b.readonlyMode&&b.readonly(),b.isCreated=!0,""===b.initContent&&(b.initContent=b.html()),b._undoStack.length>0){var a=b._undoStack.pop();a.start&&(b.html(a.html),m.cmd.range.moveToBookmark(a),b.select())}b.afterCreate(),b.options.afterCreate&&b.options.afterCreate.call(b)}});return i.removeClass("statusbar").addClass("ke-statusbar").append('<span class="ke-inline-block ke-statusbar-center-icon"></span>').append('<span class="ke-inline-block ke-statusbar-right-icon"></span>'),b._fullscreenResizeHandler&&(K(window).unbind("resize",b._fullscreenResizeHandler),b._fullscreenResizeHandler=null),a(),c?(b._fullscreenResizeHandler=function(){b.isCreated&&b.resize(_docElement().clientWidth,_docElement().clientHeight,!1)},K(window).bind("resize",b._fullscreenResizeHandler),k.select("fullscreen"),i.first().css("visibility","hidden"),i.last().css("visibility","hidden")):(_GECKO&&K(window).bind("scroll",function(){b._scrollPos=_getScrollPos()}),b.resizeType>0?_drag({moveEl:f,clickEl:i,moveFn:function(a,c,d,e,f,g){e+=g,b.resize(null,e)}}):i.first().css("visibility","hidden"),2===b.resizeType?_drag({moveEl:f,clickEl:i.last(),moveFn:function(a,c,d,e,f,g){d+=f,e+=g,b.resize(d,e)}}):i.last().css("visibility","hidden")),b},remove:function(){var a=this;return a.isCreated?(a.beforeRemove(),a.srcElement.data("kindeditor",""),a.menu&&a.hideMenu(),_each(a.dialogs,function(){a.hideDialog()}),K(document).unbind("mousedown",a._docMousedownFn),a.toolbar.remove(),a.edit.remove(),a.statusbar.last().unbind(),a.statusbar.unbind(),a.container.remove(),a.container=a.toolbar=a.edit=a.menu=null,a.dialogs=[],a.isCreated=!1,a):a},resize:function(a,b,c){var d=this;return c=_undef(c,!0),a&&(/%/.test(a)||(a=_removeUnit(a),a=a<d.minWidth?d.minWidth:a),d.container.css("width",_addUnit(a)),c&&(d.width=_addUnit(a))),b&&(b=_removeUnit(b),editHeight=_removeUnit(b)-d.toolbar.div.height()-d.statusbar.height(),editHeight=editHeight<d.minHeight?d.minHeight:editHeight,d.edit.setHeight(editHeight),c&&(d.height=_addUnit(b))),d},select:function(){return this.isCreated&&this.cmd.select(),this},html:function(a){var b=this;return a===undefined?b.isCreated?b.edit.html():_elementVal(b.srcElement):(b.isCreated?b.edit.html(a):_elementVal(b.srcElement,a),b.isCreated&&b.cmd.selection(),b)},fullHtml:function(){return this.isCreated?this.edit.html(undefined,!0):""},text:function(a){var b=this;return a===undefined?_trim(b.html().replace(/<(?!img|embed).*?>/gi,"").replace(/&nbsp;/gi," ")):b.html(_escape(a))},isEmpty:function(){return""===_trim(this.text().replace(/\r\n|\n|\r/,""))},isDirty:function(){return _trim(this.initContent.replace(/\r\n|\n|\r|t/g,""))!==_trim(this.html().replace(/\r\n|\n|\r|t/g,""))},selectedHtml:function(){var a=this.isCreated?this.cmd.range.html():"";return a=_removeBookmarkTag(_removeTempTag(a))},count:function(a){var b=this;return a=(a||"html").toLowerCase(),"html"===a?b.html().length:"text"===a?b.text().replace(/<(?:img|embed).*?>/gi,"K").replace(/\r\n|\n|\r/g,"").length:0},exec:function(a){a=a.toLowerCase();var b=this,c=b.cmd,d=_inArray(a,"selectall,copy,paste,print".split(","))<0;return d&&b.addBookmark(!1),c[a].apply(c,_toArray(arguments,1)),d&&(b.updateState(),b.addBookmark(!1),b.options.afterChange&&b.options.afterChange.call(b)),b},insertHtml:function(a,b){return this.isCreated?(a=this.beforeSetHtml(a),this.exec("inserthtml",a,b),this):this},appendHtml:function(a){if(this.html(this.html()+a),this.isCreated){var b=this.cmd;b.range.selectNodeContents(b.doc.body).collapse(!1),b.select()}return this},sync:function(){return _elementVal(this.srcElement,this.html()),this},focus:function(){return this.isCreated?this.edit.focus():this.srcElement[0].focus(),this},blur:function(){return this.isCreated?this.edit.blur():this.srcElement[0].blur(),this},addBookmark:function(a){a=_undef(a,!0);var b,c=this,d=c.edit,e=d.doc.body,f=_removeTempTag(e.innerHTML);if(a&&c._undoStack.length>0){var g=c._undoStack[c._undoStack.length-1];if(Math.abs(f.length-_removeBookmarkTag(g.html).length)<c.minChangeSize)return c}if(d.designMode&&!c._firstAddBookmark){var h=c.cmd.range;b=h.createBookmark(!0),b.html=_removeTempTag(e.innerHTML),h.moveToBookmark(b)}else b={html:f};return c._firstAddBookmark=!1,_addBookmarkToStack(c._undoStack,b),c},undo:function(){return _undoToRedo.call(this,this._undoStack,this._redoStack)},redo:function(){return _undoToRedo.call(this,this._redoStack,this._undoStack)},fullscreen:function(a){return this.fullscreenMode=a===undefined?!this.fullscreenMode:a,this.addBookmark(!1),this.remove().create()},readonly:function(a){a=_undef(a,!0);var b=this,c=b.edit,d=c.doc;b.designMode?b.toolbar.disableAll(a,[]):_each(b.noDisableItems,function(){b.toolbar[a?"disable":"enable"](this)}),_IE?d.body.contentEditable=!a:d.designMode=a?"off":"on",c.textarea[0].disabled=a},createMenu:function(a){var b=this,c=a.name,d=b.toolbar.get(c),e=d.pos();return a.x=e.x,a.y=e.y+d.height(),a.z=b.options.zIndex,a.shadowMode=_undef(a.shadowMode,b.shadowMode),a.selectedColor!==undefined?(a.cls="ke-colorpicker-"+b.themeType,a.noColor=b.lang("noColor"),b.menu=_colorpicker(a)):(a.cls="ke-menu-"+b.themeType,a.centerLineMode=!1,b.menu=_menu(a)),b.menu},hideMenu:function(){return this.menu.remove(),this.menu=null,this},hideContextmenu:function(){return this.contextmenu.remove(),this.contextmenu=null,this},createDialog:function(a){{var b=this;a.name}if(a.z=b.options.zIndex,a.shadowMode=_undef(a.shadowMode,b.shadowMode),a.closeBtn=_undef(a.closeBtn,{name:b.lang("close"),click:function(){b.hideDialog(),_IE&&b.cmd&&b.cmd.select()}}),a.noBtn=_undef(a.noBtn,{name:b.lang(a.yesBtn?"no":"close"),click:function(){b.hideDialog(),_IE&&b.cmd&&b.cmd.select()}}),"page"!=b.dialogAlignType&&(a.alignEl=b.container),a.cls="ke-dialog-"+b.themeType,b.dialogs.length>0){var c=b.dialogs[0],d=b.dialogs[b.dialogs.length-1];c.setMaskIndex(d.z+2),a.z=d.z+3,a.showMask=!1}var e=_dialog(a);return b.dialogs.push(e),e},hideDialog:function(){var a=this;if(a.dialogs.length>0&&a.dialogs.pop().remove(),a.dialogs.length>0){var b=a.dialogs[0],c=a.dialogs[a.dialogs.length-1];b.setMaskIndex(c.z-1)}return a},errorDialog:function(a){var b=this,c=b.createDialog({width:750,title:b.lang("uploadError"),body:'<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),d=K("iframe",c.div),e=K.iframeDoc(d);return e.open(),e.write(a),e.close(),K(e.body).css("background-color","#FFF"),d[0].contentWindow.focus(),b}},_instances=[],K.remove=function(a){_eachEditor(a,function(a){this.remove(),_instances.splice(a,1)})},K.sync=function(a){_eachEditor(a,function(){this.sync()})},K.html=function(a,b){_eachEditor(a,function(){this.html(b)})},K.insertHtml=function(a,b){_eachEditor(a,function(){this.insertHtml(b)})},K.appendHtml=function(a,b){_eachEditor(a,function(){this.appendHtml(b)})},_IE&&7>_V&&_nativeCommand(document,"BackgroundImageCache",!0),K.EditorClass=KEditor,K.editor=_editor,K.create=_create,K.instances=_instances,K.plugin=_plugin,K.lang=_lang,_plugin("core",function(a){var b=this,c={undo:"Z",redo:"Y",bold:"B",italic:"I",underline:"U",print:"P",selectall:"A"};if(b.afterSetHtml(function(){b.options.afterChange&&b.options.afterChange.call(b)}),b.afterCreate(function(){if("form"==b.syncType){for(var c=a(b.srcElement),d=!1;c=c.parent();)if("form"==c.name){d=!0;break}if(d){c.bind("submit",function(){b.sync(),a(window).bind("unload",function(){b.edit.textarea.remove()})});var e=a('[type="reset"]',c);e.click(function(){b.html(b.initContent),b.cmd.selection()}),b.beforeRemove(function(){c.unbind(),e.unbind()})}}}),b.clickToolbar("source",function(){b.edit.designMode?(b.toolbar.disableAll(!0),b.edit.design(!1),b.toolbar.select("source")):(b.toolbar.disableAll(!1),b.edit.design(!0),b.toolbar.unselect("source"),_GECKO?setTimeout(function(){b.cmd.selection()},0):b.cmd.selection()),b.designMode=b.edit.designMode}),b.afterCreate(function(){b.designMode||b.toolbar.disableAll(!0).select("source")}),b.clickToolbar("fullscreen",function(){b.fullscreen()}),b.fullscreenShortcut){var d=!1;b.afterCreate(function(){if(a(b.edit.doc,b.edit.textarea).keyup(function(a){27==a.which&&setTimeout(function(){b.fullscreen()},0)}),d){if(_IE&&!b.designMode)return;b.focus()}d||(d=!0)})}_each("undo,redo".split(","),function(a,d){c[d]&&b.afterCreate(function(){_ctrl(this.edit.doc,c[d],function(){b.clickToolbar(d)})}),b.clickToolbar(d,function(){b[d]()})}),b.clickToolbar("formatblock",function(){var a=b.lang("formatblock.formatBlock"),c={h1:28,h2:24,h3:18,H4:14,p:12},d=b.cmd.val("formatblock"),e=b.createMenu({name:"formatblock",width:"en"==b.langType?200:150});_each(a,function(a,f){var g="font-size:"+c[a]+"px;";"h"===a.charAt(0)&&(g+="font-weight:bold;"),e.addItem({title:'<span style="'+g+'" unselectable="on">'+f+"</span>",height:c[a]+12,checked:d===a||d===f,click:function(){b.select().exec("formatblock","<"+a+">").hideMenu()}})})}),b.clickToolbar("fontname",function(){var a=b.cmd.val("fontname"),c=b.createMenu({name:"fontname",width:150});_each(b.lang("fontname.fontName"),function(d,e){c.addItem({title:'<span style="font-family: '+d+';" unselectable="on">'+e+"</span>",checked:a===d.toLowerCase()||a===e.toLowerCase(),click:function(){b.exec("fontname",d).hideMenu()}})})}),b.clickToolbar("fontsize",function(){var a=b.cmd.val("fontsize"),c=b.createMenu({name:"fontsize",width:150});_each(b.fontSizeTable,function(d,e){c.addItem({title:'<span style="font-size:'+e+';" unselectable="on">'+e+"</span>",height:_removeUnit(e)+12,checked:a===e,click:function(){b.exec("fontsize",e).hideMenu()}})})}),_each("forecolor,hilitecolor".split(","),function(a,c){b.clickToolbar(c,function(){b.createMenu({name:c,selectedColor:b.cmd.val(c)||"default",colors:b.colorTable,click:function(a){b.exec(c,a).hideMenu()}})})}),_each("cut,copy,paste".split(","),function(a,c){b.clickToolbar(c,function(){b.focus();try{b.exec(c,null)}catch(a){alert(b.lang(c+"Error"))}})}),b.clickToolbar("about",function(){var a='<div style="margin:20px;"><div>KindEditor '+_VERSION+'</div><div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div></div>';b.createDialog({name:"about",width:350,title:b.lang("about"),body:a})}),b.plugin.getSelectedLink=function(){return b.cmd.commonAncestor("a")},b.plugin.getSelectedImage=function(){return _getImageFromRange(b.edit.cmd.range,function(a){return!/^ke-\w+$/i.test(a[0].className)})},b.plugin.getSelectedFlash=function(){return _getImageFromRange(b.edit.cmd.range,function(a){return"ke-flash"==a[0].className})},b.plugin.getSelectedMedia=function(){return _getImageFromRange(b.edit.cmd.range,function(a){return"ke-media"==a[0].className||"ke-rm"==a[0].className})},b.plugin.getSelectedAnchor=function(){return _getImageFromRange(b.edit.cmd.range,function(a){return"ke-anchor"==a[0].className})},_each("link,image,flash,media,anchor".split(","),function(a,c){var d=c.charAt(0).toUpperCase()+c.substr(1);_each("edit,delete".split(","),function(a,e){b.addContextmenu({title:b.lang(e+d),click:function(){b.loadPlugin(c,function(){b.plugin[c][e](),b.hideMenu()})},cond:b.plugin["getSelected"+d],width:150,iconClass:"edit"==e?"ke-icon-"+c:undefined})
+}),b.addContextmenu({title:"-"})}),b.plugin.getSelectedTable=function(){return b.cmd.commonAncestor("table")},b.plugin.getSelectedRow=function(){return b.cmd.commonAncestor("tr")},b.plugin.getSelectedCell=function(){return b.cmd.commonAncestor("td")},_each("prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,rowsplit,colsplit,coldelete,rowdelete,insert,delete".split(","),function(a,c){var d=_inArray(c,["prop","delete"])<0?b.plugin.getSelectedCell:b.plugin.getSelectedTable;b.addContextmenu({title:b.lang("table"+c),click:function(){b.loadPlugin("table",function(){b.plugin.table[c](),b.hideMenu()})},cond:d,width:170,iconClass:"ke-icon-table"+c})}),b.addContextmenu({title:"-"}),_each("selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript,hr,print,bold,italic,underline,strikethrough,removeformat,unlink".split(","),function(a,d){c[d]&&b.afterCreate(function(){_ctrl(this.edit.doc,c[d],function(){b.cmd.selection(),b.clickToolbar(d)})}),b.clickToolbar(d,function(){b.focus().exec(d,null)})}),b.afterCreate(function(){function c(){d.range.moveToBookmark(e),d.select(),_WEBKIT&&(a("div."+h,f).each(function(){a(this).after("<br />").remove(!0)}),a("span.Apple-style-span",f).remove(!0),a("span.Apple-tab-span",f).remove(!0),a("span[style]",f).each(function(){"nowrap"==a(this).css("white-space")&&a(this).remove(!0)}),a("meta",f).remove());var c=f[0].innerHTML;f.remove(),""!==c&&(_WEBKIT&&(c=c.replace(/(<br>)\1/gi,"$1")),2===b.pasteType&&(c=c.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/gi,""),/schemas-microsoft-com|worddocument|mso-\w+/i.test(c)?c=_clearMsWord(c,b.filterMode?b.htmlTags:a.options.htmlTags):(c=_formatHtml(c,b.filterMode?b.htmlTags:null),c=b.beforeSetHtml(c))),1===b.pasteType&&(c=c.replace(/&nbsp;/gi," "),c=c.replace(/\n\s*\n/g,"\n"),c=c.replace(/<br[^>]*>/gi,"\n"),c=c.replace(/<\/p><p[^>]*>/gi,"\n"),c=c.replace(/<[^>]+>/g,""),c=c.replace(/ {2}/g," &nbsp;"),"p"==b.newlineTag?/\n/.test(c)&&(c=c.replace(/^/,"<p>").replace(/$/,"<br /></p>").replace(/\n/g,"<br /></p><p>")):c=c.replace(/\n/g,"<br />$&")),b.insertHtml(c,!0))}var d,e,f,g=b.edit.doc,h="__kindeditor_paste__",i=!1;a(g.body).bind("paste",function(j){if(0===b.pasteType)return void j.stop();if(!i){if(i=!0,a("div."+h,g).remove(),d=b.cmd.selection(),e=d.range.createBookmark(),f=a('<div class="'+h+'"></div>',g).css({position:"absolute",width:"1px",height:"1px",overflow:"hidden",left:"-1981px",top:a(e.start).pos().y+"px","white-space":"nowrap"}),a(g.body).append(f),_IE){var k=d.range.get(!0);k.moveToElementText(f[0]),k.select(),k.execCommand("paste"),j.preventDefault()}else d.range.selectNodeContents(f[0]),d.select(),f[0].tabIndex=-1,f[0].focus();setTimeout(function(){c(),i=!1},0)}})}),b.beforeGetHtml(function(a){return _IE&&8>=_V&&(a=a.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/gi,function(a,b){return unescape(b)}),a=a.replace(/(<input)((?:\s+[^>]*)?>)/gi,function(a,b,c){return/\s+type="[^"]+"/i.test(a)?a:b+' type="text"'+c})),a.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/gi,function(a,b,c,d){return b+_unescape(c).replace(/\s+/g," ")+d}).replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/gi,function(a){var b=_getAttrList(a),c=_getCssList(b.style||""),d=_mediaAttrs(b["data-ke-tag"]),e=_undef(c.width,""),f=_undef(c.height,"");return/px/i.test(e)&&(e=_removeUnit(e)),/px/i.test(f)&&(f=_removeUnit(f)),d.width=_undef(b.width,e),d.height=_undef(b.height,f),_mediaEmbed(d)}).replace(/<img[^>]*class="?ke-anchor"?[^>]*>/gi,function(a){var b=_getAttrList(a);return'<a name="'+unescape(b["data-ke-name"])+'"></a>'}).replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/gi,function(a,b,c){return"<script"+unescape(b)+">"+unescape(c)+"</script>"}).replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/gi,function(a,b,c){return"<noscript"+unescape(b)+">"+unescape(c)+"</noscript>"}).replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/gi,function(a,b,c){return a=a.replace(/(\s+(?:href|src)=")[^"]*(")/i,function(a,b,d){return b+_unescape(c)+d}),a=a.replace(/\s+data-ke-src="[^"]*"/i,"")}).replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/gi,function(a,b,c){return b+c})}),b.beforeSetHtml(function(a){return _IE&&8>=_V&&(a=a.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/gi,function(a){var b=_getAttrList(a),c=_getCssList(b.style||"");return"none"==c.display?'<div class="ke-display-none" data-ke-input-tag="'+escape(a)+'"></div>':a})),a.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/gi,function(a){var c=_getAttrList(a);return c.src=_undef(c.src,""),c.width=_undef(c.width,0),c.height=_undef(c.height,0),_mediaImg(b.themesPath+"common/blank.gif",c)}).replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/gi,function(a){var c=_getAttrList(a);return c.href!==undefined?a:'<img class="ke-anchor" src="'+b.themesPath+'common/anchor.gif" data-ke-name="'+escape(c.name)+'" />'}).replace(/<script([^>]*)>([\s\S]*?)<\/script>/gi,function(a,b,c){return'<div class="ke-script" data-ke-script-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/gi,function(a,b,c){return'<div class="ke-noscript" data-ke-noscript-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/gi,function(a,b,c,d,e){return a.match(/\sdata-ke-src="[^"]*"/i)?a:a=b+c+'="'+d+'" data-ke-src="'+_escape(d)+'"'+e}).replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/gi,function(a,b,c){return b+"data-ke-"+c}).replace(/<table[^>]*\s+border="0"[^>]*>/gi,function(a){return a.indexOf("ke-zeroborder")>=0?a:_addClassToTag(a,"ke-zeroborder")})})})}}(window),KindEditor.lang({source:"HTML代码",preview:"预览",undo:"后退(Ctrl+Z)",redo:"前进(Ctrl+Y)",cut:"剪切(Ctrl+X)",copy:"复制(Ctrl+C)",paste:"粘贴(Ctrl+V)",plainpaste:"粘贴为无格式文本",wordpaste:"从Word粘贴",selectall:"全选(Ctrl+A)",justifyleft:"左对齐",justifycenter:"居中",justifyright:"右对齐",justifyfull:"两端对齐",insertorderedlist:"编号",insertunorderedlist:"项目符号",indent:"增加缩进",outdent:"减少缩进",subscript:"下标",superscript:"上标",formatblock:"段落",fontname:"字体",fontsize:"文字大小",forecolor:"文字颜色",hilitecolor:"文字背景",bold:"粗体(Ctrl+B)",italic:"斜体(Ctrl+I)",underline:"下划线(Ctrl+U)",strikethrough:"删除线",removeformat:"删除格式",image:"图片",multiimage:"批量图片上传",flash:"Flash",media:"视音频",table:"表格",tablecell:"单元格",hr:"插入横线",emoticons:"插入表情",link:"超级链接",unlink:"取消超级链接",fullscreen:"全屏显示",about:"关于",print:"打印(Ctrl+P)",filemanager:"文件空间",code:"插入程序代码",map:"Google地图",baidumap:"百度地图",lineheight:"行距",clearhtml:"清理HTML代码",pagebreak:"插入分页符",quickformat:"一键排版",insertfile:"插入文件",template:"插入模板",anchor:"锚点",yes:"确定",no:"取消",close:"关闭",editImage:"图片属性",deleteImage:"删除图片",editFlash:"Flash属性",deleteFlash:"删除Flash",editMedia:"视音频属性",deleteMedia:"删除视音频",editLink:"超级链接属性",deleteLink:"取消超级链接",editAnchor:"锚点属性",deleteAnchor:"删除锚点",tableprop:"表格属性",tablecellprop:"单元格属性",tableinsert:"插入表格",tabledelete:"删除表格",tablecolinsertleft:"左侧插入列",tablecolinsertright:"右侧插入列",tablerowinsertabove:"上方插入行",tablerowinsertbelow:"下方插入行",tablerowmerge:"向下合并单元格",tablecolmerge:"向右合并单元格",tablerowsplit:"拆分行",tablecolsplit:"拆分列",tablecoldelete:"删除列",tablerowdelete:"删除行",noColor:"无颜色",pleaseSelectFile:"请选择文件。",invalidImg:"请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",invalidMedia:"请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",invalidWidth:"宽度必须为数字。",invalidHeight:"高度必须为数字。",invalidBorder:"边框必须为数字。",invalidUrl:"请输入有效的URL地址。",invalidRows:"行数为必选项，只允许输入大于0的数字。",invalidCols:"列数为必选项，只允许输入大于0的数字。",invalidPadding:"边距必须为数字。",invalidSpacing:"间距必须为数字。",invalidJson:"服务器发生故障。",uploadSuccess:"上传成功。",cutError:"您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。",copyError:"您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。",pasteError:"您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。",ajaxLoading:"加载中，请稍候 ...",uploadLoading:"上传中，请稍候 ...",uploadError:"上传错误","plainpaste.comment":"请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。","wordpaste.comment":"请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。","code.pleaseInput":"请输入程序代码。","link.url":"URL","link.linkType":"打开类型","link.newWindow":"新窗口","link.selfWindow":"当前窗口","flash.url":"URL","flash.width":"宽度","flash.height":"高度","flash.upload":"上传","flash.viewServer":"文件空间","media.url":"URL","media.width":"宽度","media.height":"高度","media.autostart":"自动播放","media.upload":"上传","media.viewServer":"文件空间","image.remoteImage":"网络图片","image.localImage":"本地上传","image.remoteUrl":"图片地址","image.localUrl":"上传文件","image.size":"图片大小","image.width":"宽","image.height":"高","image.resetSize":"重置大小","image.align":"对齐方式","image.defaultAlign":"默认方式","image.leftAlign":"左对齐","image.rightAlign":"右对齐","image.imgTitle":"图片说明","image.upload":"浏览...","image.viewServer":"图片空间","multiimage.uploadDesc":"允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>","multiimage.startUpload":"开始上传","multiimage.clearAll":"全部清空","multiimage.insertAll":"全部插入","multiimage.queueLimitExceeded":"文件数量超过限制。","multiimage.fileExceedsSizeLimit":"文件大小超过限制。","multiimage.zeroByteFile":"无法上传空文件。","multiimage.invalidFiletype":"文件类型不正确。","multiimage.unknownError":"发生异常，无法上传。","multiimage.pending":"等待上传","multiimage.uploadError":"上传失败","filemanager.emptyFolder":"空文件夹","filemanager.moveup":"移到上一级文件夹","filemanager.viewType":"显示方式：","filemanager.viewImage":"缩略图","filemanager.listImage":"详细信息","filemanager.orderType":"排序方式：","filemanager.fileName":"名称","filemanager.fileSize":"大小","filemanager.fileType":"类型","insertfile.url":"URL","insertfile.title":"文件说明","insertfile.upload":"上传","insertfile.viewServer":"文件空间","table.cells":"单元格数","table.rows":"行数","table.cols":"列数","table.size":"大小","table.width":"宽度","table.height":"高度","table.percent":"%","table.px":"px","table.space":"边距间距","table.padding":"边距","table.spacing":"间距","table.align":"对齐方式","table.textAlign":"水平对齐","table.verticalAlign":"垂直对齐","table.alignDefault":"默认","table.alignLeft":"左对齐","table.alignCenter":"居中","table.alignRight":"右对齐","table.alignTop":"顶部","table.alignMiddle":"中部","table.alignBottom":"底部","table.alignBaseline":"基线","table.border":"边框","table.borderWidth":"边框","table.borderColor":"颜色","table.backgroundColor":"背景颜色","map.address":"地址: ","map.search":"搜索","baidumap.address":"地址: ","baidumap.search":"搜索","baidumap.insertDynamicMap":"插入动态地图","anchor.name":"锚点名称","formatblock.formatBlock":{h1:"标题 1",h2:"标题 2",h3:"标题 3",h4:"标题 4",p:"正 文"},"fontname.fontName":{SimSun:"宋体",NSimSun:"新宋体",FangSong_GB2312:"仿宋_GB2312",KaiTi_GB2312:"楷体_GB2312",SimHei:"黑体","Microsoft YaHei":"微软雅黑",Arial:"Arial","Arial Black":"Arial Black","Times New Roman":"Times New Roman","Courier New":"Courier New",Tahoma:"Tahoma",Verdana:"Verdana"},"lineheight.lineHeight":[{1:"单倍行距"},{1.5:"1.5倍行距"},{2:"2倍行距"},{2.5:"2.5倍行距"},{3:"3倍行距"}],"template.selectTemplate":"可选模板","template.replaceContent":"替换当前内容","template.fileList":{"1.html":"图片和文字","2.html":"表格","3.html":"项目编号"}},"zh-CN"),KindEditor.options.langType="zh-CN",KindEditor.plugin("anchor",function(a){var b=this,c="anchor",d=b.lang(c+".");b.plugin.anchor={edit:function(){var e=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keName">'+d.name+"</label>",'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',"</div>","</div>"].join(""),f=b.createDialog({name:c,width:300,title:b.lang(c),body:e,yesBtn:{name:b.lang("yes"),click:function(){b.insertHtml('<a name="'+h.val()+'">').hideDialog().focus()}}}),g=f.div,h=a('input[name="name"]',g),i=b.plugin.getSelectedAnchor();i&&h.val(unescape(i.attr("data-ke-name"))),h[0].focus(),h[0].select()},"delete":function(){b.plugin.getSelectedAnchor().remove()}},b.clickToolbar(c,b.plugin.anchor.edit)}),KindEditor.plugin("autoheight",function(a){function b(){var a=e.edit,b=a.doc.body;a.iframe[0].scroll="no",b.style.overflowY="hidden"}function c(){var b=e.edit,c=b.doc.body;b.iframe.height(f),e.resize(null,Math.max((a.IE?c.scrollHeight:c.offsetHeight)+76,f))}function d(){f=a.removeUnit(e.height),e.edit.afterChange(c),b(),c()}var e=this;if(e.autoHeightMode){var f;e.isCreated?d():e.afterCreate(d)}}),KindEditor.plugin("baidumap",function(a){var b=this,c="baidumap",d=b.lang(c+"."),e=a.undef(b.mapWidth,558),f=a.undef(b.mapHeight,360);b.clickToolbar(c,function(){function g(){h=p[0].contentWindow,i=a.iframeDoc(p)}var h,i,j=['<div style="padding:10px 20px;">','<div class="ke-header">','<div class="ke-left">',d.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+d.search+'" />',"</span>","</div>",'<div class="ke-right">','<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">'+d.insertDynamicMap+"</label>","</div>",'<div class="ke-clearfix"></div>',"</div>",'<div class="ke-map" style="width:'+e+"px;height:"+f+'px;"></div>',"</div>"].join(""),k=b.createDialog({name:c,width:e+42,title:b.lang(c),body:j,yesBtn:{name:b.lang("yes"),click:function(){var a=h.map,c=a.getCenter(),d=c.lng+","+c.lat,g=a.getZoom(),i=[o[0].checked?b.pluginsPath+"baidumap/index.html":"http://api.map.baidu.com/staticimage","?center="+encodeURIComponent(d),"&zoom="+encodeURIComponent(g),"&width="+e,"&height="+f,"&markers="+encodeURIComponent(d),"&markerStyles="+encodeURIComponent("l,A")].join("");o[0].checked?b.insertHtml('<iframe src="'+i+'" frameborder="0" style="width:'+(e+2)+"px;height:"+(f+2)+'px;"></iframe>'):b.exec("insertimage",i),b.hideDialog().focus()}},beforeRemove:function(){n.remove(),i&&i.write(""),p.remove()}}),l=k.div,m=a('[name="address"]',l),n=a('[name="searchBtn"]',l),o=a('[name="insertDynamicMap"]',k.div),p=a('<iframe class="ke-textarea" frameborder="0" src="'+b.pluginsPath+'baidumap/map.html" style="width:'+e+"px;height:"+f+'px;"></iframe>');p.bind("load",function(){p.unbind("load"),a.IE?g():setTimeout(g,0)}),a(".ke-map",l).replaceWith(p),n.click(function(){h.search(m.val())})})}),KindEditor.plugin("map",function(a){var b=this,c="map",d=b.lang(c+".");b.clickToolbar(c,function(){function e(){f=m[0].contentWindow,g=a.iframeDoc(m)}var f,g,h=['<div style="padding:10px 20px;">','<div class="ke-dialog-row">',d.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+d.search+'" />',"</span>","</div>",'<div class="ke-map" style="width:558px;height:360px;"></div>',"</div>"].join(""),i=b.createDialog({name:c,width:600,title:b.lang(c),body:h,yesBtn:{name:b.lang("yes"),click:function(){var a=(f.geocoder,f.map),c=a.getCenter().lat()+","+a.getCenter().lng(),d=a.getZoom(),e=a.getMapTypeId(),g="http://maps.googleapis.com/maps/api/staticmap";g+="?center="+encodeURIComponent(c),g+="&zoom="+encodeURIComponent(d),g+="&size=558x360",g+="&maptype="+encodeURIComponent(e),g+="&markers="+encodeURIComponent(c),g+="&language="+b.langType,g+="&sensor=false",b.exec("insertimage",g).hideDialog().focus()}},beforeRemove:function(){l.remove(),g&&g.write(""),m.remove()}}),j=i.div,k=a('[name="address"]',j),l=a('[name="searchBtn"]',j),m=(["<!doctype html><html><head>",'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',"<style>","	html { height: 100% }","	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }","	#map_canvas { height: 100% }","</style>",'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language='+b.langType+'"></script>',"<script>","var map, geocoder;","function initialize() {","	var latlng = new google.maps.LatLng(31.230393, 121.473704);","	var options = {","		zoom: 11,","		center: latlng,","		disableDefaultUI: true,","		panControl: true,","		zoomControl: true,","		mapTypeControl: true,","		scaleControl: true,","		streetViewControl: false,","		overviewMapControl: true,","		mapTypeId: google.maps.MapTypeId.ROADMAP","	};",'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',"	geocoder = new google.maps.Geocoder();","	geocoder.geocode({latLng: latlng}, function(results, status) {","		if (status == google.maps.GeocoderStatus.OK) {","			if (results[3]) {",'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',"			}","		}","	});","}","function search(address) {","	if (!map) return;","	geocoder.geocode({address : address}, function(results, status) {","		if (status == google.maps.GeocoderStatus.OK) {","			map.setZoom(11);","			map.setCenter(results[0].geometry.location);","			var marker = new google.maps.Marker({","				map: map,","				position: results[0].geometry.location","			});","		} else {",'			alert("Invalid address: " + address);',"		}","	});","}","</script>","</head>",'<body onload="initialize();">','<div id="map_canvas" style="width:100%; height:100%"></div>',"</body></html>"].join("\n"),a('<iframe class="ke-textarea" frameborder="0" src="'+b.pluginsPath+'map/map.html" style="width:558px;height:360px;"></iframe>'));m.bind("load",function(){m.unbind("load"),a.IE?e():setTimeout(e,0)}),a(".ke-map",j).replaceWith(m),l.click(function(){f.search(k.val())})})}),KindEditor.plugin("clearhtml",function(a){var b=this,c="clearhtml";b.clickToolbar(c,function(){b.focus();var c=b.html();c=c.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/gi,""),c=c.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/gi,""),c=a.formatHtml(c,{a:["href","target"],embed:["src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["src","width","height","border","alt","title",".width",".height"],table:["border"],"td,th":["rowspan","colspan"],"div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":[]}),b.html(c),b.cmd.selection(!0),b.addBookmark()})}),KindEditor.plugin("code",function(a){var b=this,c="code";b.clickToolbar(c,function(){var d=b.lang(c+"."),e=['<div style="padding:10px 20px;">','<div class="ke-dialog-row">','<select class="ke-code-type">','<option value="js">JavaScript</option>','<option value="html">HTML</option>','<option value="css">CSS</option>','<option value="php">PHP</option>','<option value="pl">Perl</option>','<option value="py">Python</option>','<option value="rb">Ruby</option>','<option value="java">Java</option>','<option value="vb">ASP/VB</option>','<option value="cpp">C/C++</option>','<option value="cs">C#</option>','<option value="xml">XML</option>','<option value="bsh">Shell</option>','<option value="">Other</option>',"</select>","</div>",'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',"</div>"].join(""),f=b.createDialog({name:c,width:450,title:b.lang(c),body:e,yesBtn:{name:b.lang("yes"),click:function(){var c=a(".ke-code-type",f.div).val(),e=g.val(),h=""===c?"":" lang-"+c,i='<pre class="prettyprint'+h+'">\n'+a.escape(e)+"</pre> ";return""===a.trim(e)?(alert(d.pleaseInput),void g[0].focus()):void b.insertHtml(i).hideDialog().focus()}}}),g=a("textarea",f.div);g[0].focus()})}),KindEditor.plugin("emoticons",function(a){var b=this,c="emoticons",d=b.emoticonsPath||b.pluginsPath+"emoticons/images/",e=void 0===b.allowPreviewEmoticons?!0:b.allowPreviewEmoticons,f=1;b.clickToolbar(c,function(){function g(c,e,f){c.mouseover(v?function(){e>r?(v.css("left",0),v.css("right","")):(v.css("left",""),v.css("right",0)),w.attr("src",d+f+".gif"),a(this).addClass("ke-on")}:function(){a(this).addClass("ke-on")}),c.mouseout(function(){a(this).removeClass("ke-on")}),c.click(function(a){b.insertHtml('<img src="'+d+f+'.gif" border="0" alt="" />').hideMenu().focus(),a.stop()})}function h(b,c){var e=document.createElement("table");c.append(e),v&&(a(e).mouseover(function(){v.show("block")}),a(e).mouseout(function(){v.hide()}),t.push(a(e))),e.className="ke-table",e.cellPadding=0,e.cellSpacing=0,e.border=0;for(var f=(b-1)*p+o,h=0;l>h;h++)for(var i=e.insertRow(h),j=0;m>j;j++){var k=a(i.insertCell(j));k.addClass("ke-cell"),g(k,j,f);var n=a('<span class="ke-img"></span>').css("background-position","-"+24*f+"px 0px").css("background-image","url("+d+"static.gif)");k.append(n),t.push(k),f++}return e}function i(){a.each(t,function(){this.unbind()})}function j(a,b){a.click(function(a){i(),y.parentNode.removeChild(y),x.remove(),y=h(b,s),k(b),f=b,a.stop()})}function k(b){x=a('<div class="ke-page"></div>'),s.append(x);for(var c=1;q>=c;c++){if(b!==c){var d=a('<a href="javascript:;">['+c+"]</a>");j(d,c),x.append(d),t.push(d)}else x.append(a("@["+c+"]"));x.append(a("@&nbsp;"))}}var l=5,m=9,n=135,o=0,p=l*m,q=Math.ceil(n/p),r=Math.floor(m/2),s=a('<div class="ke-plugin-emoticons"></div>'),t=[],u=b.createMenu({name:c,beforeRemove:function(){i()}});u.div.append(s);var v,w;e&&(v=a('<div class="ke-preview"></div>').css("right",0),w=a('<img class="ke-preview-img" src="'+d+o+'.gif" />'),s.append(v),v.append(w));var x,y=h(f,s);k(f)})}),KindEditor.plugin("filemanager",function(a){function b(a,b,c){return a+" ("+Math.ceil(b/1024)+"KB, "+c+")"}function c(a,c){c.is_dir?a.attr("title",c.filename):a.attr("title",b(c.filename,c.filesize,c.datetime))}var d=this,e="filemanager",f=a.undef(d.fileManagerJson,d.basePath+"php/file_manager_json.php"),g=d.pluginsPath+e+"/images/",h=d.lang(e+".");d.plugin.filemanagerDialog=function(b){function i(b,c,e){var g="path="+b+"&order="+c+"&dir="+p;t.showLoading(d.lang("ajaxLoading")),a.ajax(a.addParam(f,g+"&"+(new Date).getTime()),function(a){t.hideLoading(),e(a)})}function j(b,c,d,e){var f=a.formatUrl(c.current_url+d.filename,"absolute"),g=encodeURIComponent(c.current_dir_path+d.filename+"/");b.click(d.is_dir?function(){i(g,y.val(),e)}:d.is_photo?function(){r.call(this,f,d.filename)}:function(){r.call(this,f,d.filename)}),z.push(b)}function k(b,c){function d(){"VIEW"==x.val()?i(b.current_dir_path,y.val(),m):i(b.current_dir_path,y.val(),l)}a.each(z,function(){this.unbind()}),w.unbind(),x.unbind(),y.unbind(),b.current_dir_path&&w.click(function(){i(b.moveup_dir_path,y.val(),c)}),x.change(d),y.change(d),v.html("")}function l(b){k(b,l);var c=document.createElement("table");c.className="ke-table",c.cellPadding=0,c.cellSpacing=0,c.border=0,v.append(c);for(var d=b.file_list,e=0,f=d.length;f>e;e++){var i=d[e],m=a(c.insertRow(e));m.mouseover(function(){a(this).addClass("ke-on")}).mouseout(function(){a(this).removeClass("ke-on")});var n=g+(i.is_dir?"folder-16.gif":"file-16.gif"),o=a('<img src="'+n+'" width="16" height="16" alt="'+i.filename+'" align="absmiddle" />'),p=a(m[0].insertCell(0)).addClass("ke-cell ke-name").append(o).append(document.createTextNode(" "+i.filename));!i.is_dir||i.has_file?(m.css("cursor","pointer"),p.attr("title",i.filename),j(p,b,i,l)):p.attr("title",h.emptyFolder),a(m[0].insertCell(1)).addClass("ke-cell ke-size").html(i.is_dir?"-":Math.ceil(i.filesize/1024)+"KB"),a(m[0].insertCell(2)).addClass("ke-cell ke-datetime").html(i.datetime)}}function m(b){k(b,m);for(var d=b.file_list,e=0,f=d.length;f>e;e++){var i=d[e],l=a('<div class="ke-inline-block ke-item"></div>');v.append(l);var n=a('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){a(this).addClass("ke-on")}).mouseout(function(){a(this).removeClass("ke-on")});l.append(n);var o=b.current_url+i.filename,p=i.is_dir?g+"folder-64.gif":i.is_photo?o:g+"file-64.gif",q=a('<img src="'+p+'" width="80" height="80" alt="'+i.filename+'" />');!i.is_dir||i.has_file?(n.css("cursor","pointer"),c(n,i),j(n,b,i,m)):n.attr("title",h.emptyFolder),n.append(q),l.append('<div class="ke-name" title="'+i.filename+'">'+i.filename+"</div>")}}var n=a.undef(b.width,650),o=a.undef(b.height,510),p=a.undef(b.dirName,""),q=a.undef(b.viewType,"VIEW").toUpperCase(),r=b.clickFn,s=['<div style="padding:10px 20px;">','<div class="ke-plugin-filemanager-header">','<div class="ke-left">','<img class="ke-inline-block" name="moveupImg" src="'+g+'go-up.gif" width="16" height="16" border="0" alt="" /> ','<a class="ke-inline-block" name="moveupLink" href="javascript:;">'+h.moveup+"</a>","</div>",'<div class="ke-right">',h.viewType+' <select class="ke-inline-block" name="viewType">','<option value="VIEW">'+h.viewImage+"</option>",'<option value="LIST">'+h.listImage+"</option>","</select> ",h.orderType+' <select class="ke-inline-block" name="orderType">','<option value="NAME">'+h.fileName+"</option>",'<option value="SIZE">'+h.fileSize+"</option>",'<option value="TYPE">'+h.fileType+"</option>","</select>","</div>",'<div class="ke-clearfix"></div>',"</div>",'<div class="ke-plugin-filemanager-body"></div>',"</div>"].join(""),t=d.createDialog({name:e,width:n,height:o,title:d.lang(e),body:s}),u=t.div,v=a(".ke-plugin-filemanager-body",u),w=(a('[name="moveupImg"]',u),a('[name="moveupLink"]',u)),x=(a('[name="viewServer"]',u),a('[name="viewType"]',u)),y=a('[name="orderType"]',u),z=[];return x.val(q),i("",y.val(),"VIEW"==q?m:l),t}}),KindEditor.plugin("flash",function(a){var b=this,c="flash",d=b.lang(c+"."),e=a.undef(b.allowFlashUpload,!0),f=a.undef(b.allowFileManager,!1),g=a.undef(b.formatUploadUrl,!0),h=a.undef(b.extraFileUploadParams,{}),i=a.undef(b.filePostName,"imgFile"),j=a.undef(b.uploadJson,b.basePath+"php/upload_json.php");b.plugin.flash={edit:function(){var k=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+d.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+d.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+d.viewServer+'" />',"</span>","</div>",'<div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+d.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',"</div>",'<div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+d.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',"</div>","</div>"].join(""),l=b.createDialog({name:c,width:450,title:b.lang(c),body:k,yesBtn:{name:b.lang("yes"),click:function(){var c=a.trim(n.val()),d=p.val(),e=q.val();if("http://"==c||a.invalidUrl(c))return alert(b.lang("invalidUrl")),void n[0].focus();if(!/^\d*$/.test(d))return alert(b.lang("invalidWidth")),void p[0].focus();if(!/^\d*$/.test(e))return alert(b.lang("invalidHeight")),void q[0].focus();var f=a.mediaImg(b.themesPath+"common/blank.gif",{src:c,type:a.mediaType(".swf"),width:d,height:e,quality:"high"});b.insertHtml(f).hideDialog().focus()}}}),m=l.div,n=a('[name="url"]',m),o=a('[name="viewServer"]',m),p=a('[name="width"]',m),q=a('[name="height"]',m);if(n.val("http://"),e){var r=a.uploadbutton({button:a(".ke-upload-button",m)[0],fieldName:i,extraParams:h,url:a.addParam(j,"dir=flash"),afterUpload:function(d){if(l.hideLoading(),0===d.error){var e=d.url;g&&(e=a.formatUrl(e,"absolute")),n.val(e),b.afterUpload&&b.afterUpload.call(b,e,d,c),alert(b.lang("uploadSuccess"))}else alert(d.message)},afterError:function(a){l.hideLoading(),b.errorDialog(a)}});r.fileBox.change(function(){l.showLoading(b.lang("uploadLoading")),r.submit()})}else a(".ke-upload-button",m).hide();f?o.click(function(){b.loadPlugin("filemanager",function(){b.plugin.filemanagerDialog({viewType:"LIST",dirName:"flash",clickFn:function(c){b.dialogs.length>1&&(a('[name="url"]',m).val(c),b.afterSelectFile&&b.afterSelectFile.call(b,c),b.hideDialog())}})})}):o.hide();var s=b.plugin.getSelectedFlash();if(s){var t=a.mediaAttrs(s.attr("data-ke-tag"));n.val(t.src),p.val(a.removeUnit(s.css("width"))||t.width||0),q.val(a.removeUnit(s.css("height"))||t.height||0)}n[0].focus(),n[0].select()},"delete":function(){b.plugin.getSelectedFlash().remove(),b.addBookmark()}},b.clickToolbar(c,b.plugin.flash.edit)}),KindEditor.plugin("image",function(a){var b=this,c="image",d=a.undef(b.allowImageUpload,!0),e=a.undef(b.allowImageRemote,!0),f=a.undef(b.formatUploadUrl,!0),g=a.undef(b.allowFileManager,!1),h=a.undef(b.uploadJson,b.basePath+"php/upload_json.php"),i=a.undef(b.imageTabIndex,0),j=b.pluginsPath+"image/images/",k=a.undef(b.extraFileUploadParams,{}),l=a.undef(b.filePostName,"imgFile"),m=a.undef(b.fillDescAfterUploadImage,!1),n=b.lang(c+".");b.plugin.imageDialog=function(d){function e(a,b){D.val(a),E.val(b),J=a,K=b}var i=(d.imageUrl,a.undef(d.imageWidth,""),a.undef(d.imageHeight,""),a.undef(d.imageTitle,""),a.undef(d.imageAlign,""),a.undef(d.showRemote,!0)),o=a.undef(d.showLocal,!0),p=a.undef(d.tabIndex,0),q=d.clickFn,r="kindeditor_upload_iframe_"+(new Date).getTime(),s=[];for(var t in k)s.push('<input type="hidden" name="'+t+'" value="'+k[t]+'" />');var u,v=['<div style="padding:20px;">','<div class="tabs"></div>','<div class="tab1" style="display:none;">','<div class="ke-dialog-row">','<label for="remoteUrl" style="width:60px;">'+n.remoteUrl+"</label>",'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+n.viewServer+'" />',"</span>","</div>",'<div class="ke-dialog-row">','<label for="remoteWidth" style="width:60px;">'+n.size+"</label>",n.width+' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',n.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ','<img class="ke-refresh-btn" src="'+j+'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="'+n.resetSize+'" />',"</div>",'<div class="ke-dialog-row">','<label style="width:60px;">'+n.align+"</label>",'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="'+j+'align_top.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="'+j+'align_left.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="'+j+'align_right.gif" width="23" height="25" alt="" />',"</div>",'<div class="ke-dialog-row">','<label for="remoteTitle" style="width:60px;">'+n.imgTitle+"</label>",'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',"</div>","</div>",'<div class="tab2" style="display:none;">','<iframe name="'+r+'" style="display:none;"></iframe>','<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+r+'" action="'+a.addParam(h,"dir=image")+'">','<div class="ke-dialog-row">',s.join(""),'<label style="width:60px;">'+n.localUrl+"</label>",'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+n.upload+'" />',"</div>","</form>","</div>","</div>"].join(""),w=o||g?450:400,x=o&&i?300:250,y=b.createDialog({name:c,width:w,height:x,title:b.lang(c),body:v,yesBtn:{name:b.lang("yes"),click:function(){if(!y.isLoading){if(o&&i&&u&&1===u.selectedIndex||!i)return""==I.fileBox.val()?void alert(b.lang("pleaseSelectFile")):(y.showLoading(b.lang("uploadLoading")),I.submit(),void B.val(""));var c=a.trim(A.val()),d=D.val(),e=E.val(),f=G.val(),g="";return H.each(function(){return this.checked?(g=this.value,!1):void 0}),"http://"==c||a.invalidUrl(c)?(alert(b.lang("invalidUrl")),void A[0].focus()):/^\d*$/.test(d)?/^\d*$/.test(e)?void q.call(b,c,f,d,e,0,g):(alert(b.lang("invalidHeight")),void E[0].focus()):(alert(b.lang("invalidWidth")),void D[0].focus())}}},beforeRemove:function(){C.unbind(),D.unbind(),E.unbind(),F.unbind()}}),z=y.div,A=a('[name="url"]',z),B=a('[name="localUrl"]',z),C=a('[name="viewServer"]',z),D=a('.tab1 [name="width"]',z),E=a('.tab1 [name="height"]',z),F=a(".ke-refresh-btn",z),G=a('.tab1 [name="title"]',z),H=a('.tab1 [name="align"]',z);i&&o?(u=a.tabs({src:a(".tabs",z),afterSelect:function(){}}),u.add({title:n.remoteImage,panel:a(".tab1",z)}),u.add({title:n.localImage,panel:a(".tab2",z)}),u.select(p)):i?a(".tab1",z).show():o&&a(".tab2",z).show();
+var I=a.uploadbutton({button:a(".ke-upload-button",z)[0],fieldName:l,form:a(".ke-form",z),target:r,width:60,afterUpload:function(d){if(y.hideLoading(),0===d.error){var e=d.url;f&&(e=a.formatUrl(e,"absolute")),b.afterUpload&&b.afterUpload.call(b,e,d,c),m?(a(".ke-dialog-row #remoteUrl",z).val(e),a(".ke-tabs-li",z)[0].click(),a(".ke-refresh-btn",z).click()):q.call(b,e,d.title,d.width,d.height,d.border,d.align)}else alert(d.message)},afterError:function(a){y.hideLoading(),b.errorDialog(a)}});I.fileBox.change(function(){B.val(I.fileBox.val())}),g?C.click(function(){b.loadPlugin("filemanager",function(){b.plugin.filemanagerDialog({viewType:"VIEW",dirName:"image",clickFn:function(c){b.dialogs.length>1&&(a('[name="url"]',z).val(c),b.afterSelectFile&&b.afterSelectFile.call(b,c),b.hideDialog())}})})}):C.hide();var J=0,K=0;return F.click(function(){var b=a('<img src="'+A.val()+'" />',document).css({position:"absolute",visibility:"hidden",top:0,left:"-1000px"});b.bind("load",function(){e(b.width(),b.height()),b.remove()}),a(document.body).append(b)}),D.change(function(){J>0&&E.val(Math.round(K/J*parseInt(this.value,10)))}),E.change(function(){K>0&&D.val(Math.round(J/K*parseInt(this.value,10)))}),A.val(d.imageUrl),e(d.imageWidth,d.imageHeight),G.val(d.imageTitle),H.each(function(){return this.value===d.imageAlign?(this.checked=!0,!1):void 0}),i&&0===p&&(A[0].focus(),A[0].select()),y},b.plugin.image={edit:function(){var a=b.plugin.getSelectedImage();b.plugin.imageDialog({imageUrl:a?a.attr("data-ke-src"):"http://",imageWidth:a?a.width():"",imageHeight:a?a.height():"",imageTitle:a?a.attr("title"):"",imageAlign:a?a.attr("align"):"",showRemote:e,showLocal:d,tabIndex:a?0:i,clickFn:function(c,d,e,f,g,h){a?(a.attr("src",c),a.attr("data-ke-src",c),a.attr("width",e),a.attr("height",f),a.attr("title",d),a.attr("align",h),a.attr("alt",d)):b.exec("insertimage",c,d,e,f,g,h),setTimeout(function(){b.hideDialog().focus()},0)}})},"delete":function(){var a=b.plugin.getSelectedImage();"a"==a.parent().name&&(a=a.parent()),a.remove(),b.addBookmark()}},b.clickToolbar(c,b.plugin.image.edit)}),KindEditor.plugin("insertfile",function(a){var b=this,c="insertfile",d=a.undef(b.allowFileUpload,!0),e=a.undef(b.allowFileManager,!1),f=a.undef(b.formatUploadUrl,!0),g=a.undef(b.uploadJson,b.basePath+"php/upload_json.php"),h=a.undef(b.extraFileUploadParams,{}),i=a.undef(b.filePostName,"imgFile"),j=b.lang(c+".");b.plugin.fileDialog=function(k){var l=a.undef(k.fileUrl,"http://"),m=a.undef(k.fileTitle,""),n=k.clickFn,o=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+j.url+"</label>",'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+j.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+j.viewServer+'" />',"</span>","</div>",'<div class="ke-dialog-row">','<label for="keTitle" style="width:60px;">'+j.title+"</label>",'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',"</div>","</form>","</div>"].join(""),p=b.createDialog({name:c,width:450,title:b.lang(c),body:o,yesBtn:{name:b.lang("yes"),click:function(){var c=a.trim(r.val()),d=t.val();return"http://"==c||a.invalidUrl(c)?(alert(b.lang("invalidUrl")),void r[0].focus()):(""===a.trim(d)&&(d=c),void n.call(b,c,d))}}}),q=p.div,r=a('[name="url"]',q),s=a('[name="viewServer"]',q),t=a('[name="title"]',q);if(d){var u=a.uploadbutton({button:a(".ke-upload-button",q)[0],fieldName:i,url:a.addParam(g,"dir=file"),extraParams:h,afterUpload:function(d){if(p.hideLoading(),0===d.error){var e=d.url;f&&(e=a.formatUrl(e,"absolute")),r.val(e),b.afterUpload&&b.afterUpload.call(b,e,d,c),alert(b.lang("uploadSuccess"))}else alert(d.message)},afterError:function(a){p.hideLoading(),b.errorDialog(a)}});u.fileBox.change(function(){p.showLoading(b.lang("uploadLoading")),u.submit()})}else a(".ke-upload-button",q).hide();e?s.click(function(){b.loadPlugin("filemanager",function(){b.plugin.filemanagerDialog({viewType:"LIST",dirName:"file",clickFn:function(c){b.dialogs.length>1&&(a('[name="url"]',q).val(c),b.afterSelectFile&&b.afterSelectFile.call(b,c),b.hideDialog())}})})}):s.hide(),r.val(l),t.val(m),r[0].focus(),r[0].select()},b.clickToolbar(c,function(){b.plugin.fileDialog({clickFn:function(a,c){var d='<a class="ke-insertfile" href="'+a+'" data-ke-src="'+a+'" target="_blank">'+c+"</a>";b.insertHtml(d).hideDialog().focus()}})})}),KindEditor.plugin("lineheight",function(a){var b=this,c="lineheight",d=b.lang(c+".");b.clickToolbar(c,function(){var e="",f=b.cmd.commonNode({"*":".line-height"});f&&(e=f.css("line-height"));var g=b.createMenu({name:c,width:150});a.each(d.lineHeight,function(c,d){a.each(d,function(a,c){g.addItem({title:c,checked:e===a,click:function(){b.cmd.toggle('<span style="line-height:'+a+';"></span>',{span:".line-height="+a}),b.updateState(),b.addBookmark(),b.hideMenu()}})})})})}),KindEditor.plugin("link",function(a){var b=this,c="link";b.plugin.link={edit:function(){var d=b.lang(c+"."),e='<div style="padding:20px;"><div class="ke-dialog-row"><label for="keUrl" style="width:60px;">'+d.url+'</label><input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div><div class="ke-dialog-row""><label for="keType" style="width:60px;">'+d.linkType+'</label><select id="keType" name="type"></select></div></div>',f=b.createDialog({name:c,width:450,title:b.lang(c),body:e,yesBtn:{name:b.lang("yes"),click:function(){var c=a.trim(h.val());return"http://"==c||a.invalidUrl(c)?(alert(b.lang("invalidUrl")),void h[0].focus()):void b.exec("createlink",c,i.val()).hideDialog().focus()}}}),g=f.div,h=a('input[name="url"]',g),i=a('select[name="type"]',g);h.val("http://"),i[0].options[0]=new Option(d.newWindow,"_blank"),i[0].options[1]=new Option(d.selfWindow,""),b.cmd.selection();var j=b.plugin.getSelectedLink();j&&(b.cmd.range.selectNode(j[0]),b.cmd.select(),h.val(j.attr("data-ke-src")),i.val(j.attr("target"))),h[0].focus(),h[0].select()},"delete":function(){b.exec("unlink",null)}},b.clickToolbar(c,b.plugin.link.edit)}),KindEditor.plugin("media",function(a){var b=this,c="media",d=b.lang(c+"."),e=a.undef(b.allowMediaUpload,!0),f=a.undef(b.allowFileManager,!1),g=a.undef(b.formatUploadUrl,!0),h=a.undef(b.extraFileUploadParams,{}),i=a.undef(b.filePostName,"imgFile"),j=a.undef(b.uploadJson,b.basePath+"php/upload_json.php");b.plugin.media={edit:function(){var k=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+d.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+d.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+d.viewServer+'" />',"</span>","</div>",'<div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+d.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',"</div>",'<div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+d.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',"</div>",'<div class="ke-dialog-row">','<label for="keAutostart">'+d.autostart+"</label>",'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',"</div>","</div>"].join(""),l=b.createDialog({name:c,width:450,height:230,title:b.lang(c),body:k,yesBtn:{name:b.lang("yes"),click:function(){var c=a.trim(n.val()),d=p.val(),e=q.val();if("http://"==c||a.invalidUrl(c))return alert(b.lang("invalidUrl")),void n[0].focus();if(!/^\d*$/.test(d))return alert(b.lang("invalidWidth")),void p[0].focus();if(!/^\d*$/.test(e))return alert(b.lang("invalidHeight")),void q[0].focus();var f=a.mediaImg(b.themesPath+"common/blank.gif",{src:c,type:a.mediaType(c),width:d,height:e,autostart:r[0].checked?"true":"false",loop:"true"});b.insertHtml(f).hideDialog().focus()}}}),m=l.div,n=a('[name="url"]',m),o=a('[name="viewServer"]',m),p=a('[name="width"]',m),q=a('[name="height"]',m),r=a('[name="autostart"]',m);if(n.val("http://"),e){var s=a.uploadbutton({button:a(".ke-upload-button",m)[0],fieldName:i,extraParams:h,url:a.addParam(j,"dir=media"),afterUpload:function(d){if(l.hideLoading(),0===d.error){var e=d.url;g&&(e=a.formatUrl(e,"absolute")),n.val(e),b.afterUpload&&b.afterUpload.call(b,e,d,c),alert(b.lang("uploadSuccess"))}else alert(d.message)},afterError:function(a){l.hideLoading(),b.errorDialog(a)}});s.fileBox.change(function(){l.showLoading(b.lang("uploadLoading")),s.submit()})}else a(".ke-upload-button",m).hide();f?o.click(function(){b.loadPlugin("filemanager",function(){b.plugin.filemanagerDialog({viewType:"LIST",dirName:"media",clickFn:function(c){b.dialogs.length>1&&(a('[name="url"]',m).val(c),b.afterSelectFile&&b.afterSelectFile.call(b,c),b.hideDialog())}})})}):o.hide();var t=b.plugin.getSelectedMedia();if(t){var u=a.mediaAttrs(t.attr("data-ke-tag"));n.val(u.src),p.val(a.removeUnit(t.css("width"))||u.width||0),q.val(a.removeUnit(t.css("height"))||u.height||0),r[0].checked="true"===u.autostart}n[0].focus(),n[0].select()},"delete":function(){b.plugin.getSelectedMedia().remove(),b.addBookmark()}},b.clickToolbar(c,b.plugin.media.edit)}),function(a){function b(a){this.init(a)}a.extend(b,{init:function(b){function c(b,c){a(".ke-status > div",b).hide(),a(".ke-message",b).addClass("ke-error").show().html(a.escape(c))}var d=this;b.afterError=b.afterError||function(a){alert(a)},d.options=b,d.progressbars={},d.div=a(b.container).html(['<div class="ke-swfupload">','<div class="ke-swfupload-top">','<div class="ke-inline-block ke-swfupload-button">','<input type="button" value="Browse" />',"</div>",'<div class="ke-inline-block ke-swfupload-desc">'+b.uploadDesc+"</div>",'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">','<input type="button" class="ke-button-common ke-button" value="'+b.startButtonValue+'" />',"</span>","</div>",'<div class="ke-swfupload-body"></div>',"</div>"].join("")),d.bodyDiv=a(".ke-swfupload-body",d.div);var e={debug:!1,upload_url:b.uploadUrl,flash_url:b.flashUrl,file_post_name:b.filePostName,button_placeholder:a(".ke-swfupload-button > input",d.div)[0],button_image_url:b.buttonImageUrl,button_width:b.buttonWidth,button_height:b.buttonHeight,button_cursor:SWFUpload.CURSOR.HAND,file_types:b.fileTypes,file_types_description:b.fileTypesDesc,file_upload_limit:b.fileUploadLimit,file_size_limit:b.fileSizeLimit,post_params:b.postParams,file_queued_handler:function(a){a.url=d.options.fileIconUrl,d.appendFile(a)},file_queue_error_handler:function(c,d){var e="";switch(d){case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:e=b.queueLimitExceeded;break;case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:e=b.fileExceedsSizeLimit;break;case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:e=b.zeroByteFile;break;case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:e=b.invalidFiletype;break;default:e=b.unknownError}a.DEBUG&&alert(e)},upload_start_handler:function(b){var c=this,d=a('div[data-id="'+b.id+'"]',c.bodyDiv);a(".ke-status > div",d).hide(),a(".ke-progressbar",d).show()},upload_progress_handler:function(a,b,c){var e=Math.round(100*b/c),f=d.progressbars[a.id];f.bar.css("width",Math.round(80*e/100)+"px"),f.percent.html(e+"%")},upload_error_handler:function(b){if(b&&b.filestatus==SWFUpload.FILE_STATUS.ERROR){var e=a('div[data-id="'+b.id+'"]',d.bodyDiv).eq(0);c(e,d.options.errorMessage)}},upload_success_handler:function(b,e){var f=a('div[data-id="'+b.id+'"]',d.bodyDiv).eq(0),g={};try{g=a.json(e)}catch(h){d.options.afterError.call(this,"<!doctype html><html>"+e+"</html>")}return 0!==g.error?void c(f,a.DEBUG?g.message:d.options.errorMessage):(b.url=g.url,a(".ke-img",f).attr("src",b.url).attr("data-status",b.filestatus).data("data",g),void a(".ke-status > div",f).hide())}};d.swfu=new SWFUpload(e),a(".ke-swfupload-startupload input",d.div).click(function(){d.swfu.startUpload()})},getUrlList:function(){var b=[];return a(".ke-img",self.bodyDiv).each(function(){var c=a(this),d=c.attr("data-status");d==SWFUpload.FILE_STATUS.COMPLETE&&b.push(c.data("data"))}),b},removeFile:function(b){var c=this;c.swfu.cancelUpload(b);var d=a('div[data-id="'+b+'"]',c.bodyDiv);a(".ke-photo",d).unbind(),a(".ke-delete",d).unbind(),d.remove()},removeFiles:function(){var b=this;a(".ke-item",b.bodyDiv).each(function(){b.removeFile(a(this).attr("data-id"))})},appendFile:function(b){var c=this,d=a('<div class="ke-inline-block ke-item" data-id="'+b.id+'"></div>');c.bodyDiv.append(d);var e=a('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){a(this).addClass("ke-on")}).mouseout(function(){a(this).removeClass("ke-on")});d.append(e);var f=a('<img src="'+b.url+'" class="ke-img" data-status="'+b.filestatus+'" width="80" height="80" alt="'+b.name+'" />');e.append(f),a('<span class="ke-delete"></span>').appendTo(e).click(function(){c.removeFile(b.id)});var g=a('<div class="ke-status"></div>').appendTo(e);a(['<div class="ke-progressbar">','<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>','<div class="ke-progressbar-percent">0%</div></div>'].join("")).hide().appendTo(g),a('<div class="ke-message">'+c.options.pendingMessage+"</div>").appendTo(g),d.append('<div class="ke-name">'+b.name+"</div>"),c.progressbars[b.id]={bar:a(".ke-progressbar-bar-inner",e),percent:a(".ke-progressbar-percent",e)}},remove:function(){this.removeFiles(),this.swfu.destroy(),this.div.html("")}}),a.swfupload=function(a,c){return new b(a,c)}}(KindEditor),KindEditor.plugin("multiimage",function(a){var b=this,c="multiimage",d=(a.undef(b.formatUploadUrl,!0),a.undef(b.uploadJson,b.basePath+"php/upload_json.php")),e=b.pluginsPath+"multiimage/images/",f=a.undef(b.imageSizeLimit,"1MB"),g=(a.undef(b.imageFileTypes,"*.jpg;*.gif;*.png"),a.undef(b.imageUploadLimit,20)),h=a.undef(b.filePostName,"imgFile"),i=b.lang(c+".");b.plugin.multiImageDialog=function(j){var k=j.clickFn,l=a.tmpl(i.uploadDesc,{uploadLimit:g,sizeLimit:f}),m=['<div style="padding:20px;">','<div class="swfupload">',"</div>","</div>"].join(""),n=b.createDialog({name:c,width:650,height:510,title:b.lang(c),body:m,previewBtn:{name:i.insertAll,click:function(){k.call(b,p.getUrlList())}},yesBtn:{name:i.clearAll,click:function(){p.removeFiles()}},beforeRemove:function(){(!a.IE||a.V<=8)&&p.remove()}}),o=n.div,p=a.swfupload({container:a(".swfupload",o),buttonImageUrl:e+("zh-CN"==b.langType?"select-files-zh-CN.png":"select-files-en.png"),buttonWidth:"zh-CN"==b.langType?72:88,buttonHeight:23,fileIconUrl:e+"image.png",uploadDesc:l,startButtonValue:i.startUpload,uploadUrl:a.addParam(d,"dir=image"),flashUrl:e+"swfupload.swf",filePostName:h,fileTypes:"*.jpg;*.jpeg;*.gif;*.png;*.bmp",fileTypesDesc:"Image Files",fileUploadLimit:g,fileSizeLimit:f,postParams:a.undef(b.extraFileUploadParams,{}),queueLimitExceeded:i.queueLimitExceeded,fileExceedsSizeLimit:i.fileExceedsSizeLimit,zeroByteFile:i.zeroByteFile,invalidFiletype:i.invalidFiletype,unknownError:i.unknownError,pendingMessage:i.pending,errorMessage:i.uploadError,afterError:function(a){b.errorDialog(a)}});return n},b.clickToolbar(c,function(){b.plugin.multiImageDialog({clickFn:function(c){0!==c.length&&(a.each(c,function(a,c){b.afterUpload&&b.afterUpload.call(b,c.url,c,"multiimage"),b.exec("insertimage",c.url,c.title,c.width,c.height,c.border,c.align)}),setTimeout(function(){b.hideDialog().focus()},0))}})})}),function(){window.SWFUpload=function(a){this.initSWFUpload(a)},SWFUpload.prototype.initSWFUpload=function(a){try{this.customSettings={},this.settings=a,this.eventQueue=[],this.movieName="KindEditor_SWFUpload_"+SWFUpload.movieCount++,this.movieElement=null,SWFUpload.instances[this.movieName]=this,this.initSettings(),this.loadFlash(),this.displayDebugInfo()}catch(b){throw delete SWFUpload.instances[this.movieName],b}},SWFUpload.instances={},SWFUpload.movieCount=0,SWFUpload.version="2.2.0 2009-03-25",SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130},SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290},SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5},SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,START_UPLOAD:-120},SWFUpload.CURSOR={ARROW:-1,HAND:-2},SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"},SWFUpload.completeURL=function(a){if("string"!=typeof a||a.match(/^https?:\/\//i)||a.match(/^\//))return a;var b=(window.location.protocol+"//"+window.location.hostname+(window.location.port?":"+window.location.port:""),window.location.pathname.lastIndexOf("/"));return path=0>=b?"/":window.location.pathname.substr(0,b)+"/",path+a},SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(a,b){this.settings[a]=void 0==this.settings[a]?b:this.settings[a]},this.ensureDefault("upload_url",""),this.ensureDefault("preserve_relative_urls",!1),this.ensureDefault("file_post_name","Filedata"),this.ensureDefault("post_params",{}),this.ensureDefault("use_query_string",!1),this.ensureDefault("requeue_on_error",!1),this.ensureDefault("http_success",[]),this.ensureDefault("assume_success_timeout",0),this.ensureDefault("file_types","*.*"),this.ensureDefault("file_types_description","All Files"),this.ensureDefault("file_size_limit",0),this.ensureDefault("file_upload_limit",0),this.ensureDefault("file_queue_limit",0),this.ensureDefault("flash_url","swfupload.swf"),this.ensureDefault("prevent_swf_caching",!0),this.ensureDefault("button_image_url",""),this.ensureDefault("button_width",1),this.ensureDefault("button_height",1),this.ensureDefault("button_text",""),this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;"),this.ensureDefault("button_text_top_padding",0),this.ensureDefault("button_text_left_padding",0),this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES),this.ensureDefault("button_disabled",!1),this.ensureDefault("button_placeholder_id",""),this.ensureDefault("button_placeholder",null),this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW),this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW),this.ensureDefault("debug",!1),this.settings.debug_enabled=this.settings.debug,this.settings.return_upload_start_handler=this.returnUploadStart,this.ensureDefault("swfupload_loaded_handler",null),this.ensureDefault("file_dialog_start_handler",null),this.ensureDefault("file_queued_handler",null),this.ensureDefault("file_queue_error_handler",null),this.ensureDefault("file_dialog_complete_handler",null),this.ensureDefault("upload_start_handler",null),this.ensureDefault("upload_progress_handler",null),this.ensureDefault("upload_error_handler",null),this.ensureDefault("upload_success_handler",null),this.ensureDefault("upload_complete_handler",null),this.ensureDefault("debug_handler",this.debugMessage),this.ensureDefault("custom_settings",{}),this.customSettings=this.settings.custom_settings,this.settings.prevent_swf_caching&&(this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+(new Date).getTime()),this.settings.preserve_relative_urls||(this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url),this.settings.button_image_url=SWFUpload.completeURL(this.settings.button_image_url)),delete this.ensureDefault},SWFUpload.prototype.loadFlash=function(){var a,b;if(null!==document.getElementById(this.movieName))throw"ID "+this.movieName+" is already in use. The Flash Object could not be added";if(a=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder,void 0==a)throw"Could not find the placeholder element: "+this.settings.button_placeholder_id;b=document.createElement("div"),b.innerHTML=this.getFlashHTML(),a.parentNode.replaceChild(b.firstChild,a),void 0==window[this.movieName]&&(window[this.movieName]=this.getMovieElement())},SWFUpload.prototype.getFlashHTML=function(){var a="";return KindEditor.IE&&KindEditor.V>8&&(a=' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'),['<object id="',this.movieName,'"'+a+' type="application/x-shockwave-flash" data="',this.settings.flash_url,'" width="',this.settings.button_width,'" height="',this.settings.button_height,'" class="swfupload">','<param name="wmode" value="',this.settings.button_window_mode,'" />','<param name="movie" value="',this.settings.flash_url,'" />','<param name="quality" value="high" />','<param name="menu" value="false" />','<param name="allowScriptAccess" value="always" />','<param name="flashvars" value="'+this.getFlashVars()+'" />',"</object>"].join("")},SWFUpload.prototype.getFlashVars=function(){var a=this.buildParamString(),b=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&amp;uploadURL=",encodeURIComponent(this.settings.upload_url),"&amp;useQueryString=",encodeURIComponent(this.settings.use_query_string),"&amp;requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&amp;httpSuccess=",encodeURIComponent(b),"&amp;assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&amp;params=",encodeURIComponent(a),"&amp;filePostName=",encodeURIComponent(this.settings.file_post_name),"&amp;fileTypes=",encodeURIComponent(this.settings.file_types),"&amp;fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&amp;fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&amp;fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&amp;fileQueueLimit=",encodeURIComponent(this.settings.file_queue_limit),"&amp;debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&amp;buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&amp;buttonWidth=",encodeURIComponent(this.settings.button_width),"&amp;buttonHeight=",encodeURIComponent(this.settings.button_height),"&amp;buttonText=",encodeURIComponent(this.settings.button_text),"&amp;buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&amp;buttonTextLeftPadding=",encodeURIComponent(this.settings.button_text_left_padding),"&amp;buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&amp;buttonAction=",encodeURIComponent(this.settings.button_action),"&amp;buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&amp;buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")},SWFUpload.prototype.getMovieElement=function(){if(void 0==this.movieElement&&(this.movieElement=document.getElementById(this.movieName)),null===this.movieElement)throw"Could not find Flash element";return this.movieElement},SWFUpload.prototype.buildParamString=function(){var a=this.settings.post_params,b=[];if("object"==typeof a)for(var c in a)a.hasOwnProperty(c)&&b.push(encodeURIComponent(c.toString())+"="+encodeURIComponent(a[c].toString()));return b.join("&amp;")},SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,!1);var a=null;if(a=this.getMovieElement(),a&&"unknown"==typeof a.CallFunction){for(var b in a)try{"function"==typeof a[b]&&(a[b]=null)}catch(c){}try{a.parentNode.removeChild(a)}catch(d){}}return window[this.movieName]=null,SWFUpload.instances[this.movieName]=null,delete SWFUpload.instances[this.movieName],this.movieElement=null,this.settings=null,this.customSettings=null,this.eventQueue=null,this.movieName=null,!0}catch(e){return!1}},SWFUpload.prototype.displayDebugInfo=function(){this.debug(["---SWFUpload Instance Info---\n","Version: ",SWFUpload.version,"\n","Movie Name: ",this.movieName,"\n","Settings:\n","	","upload_url:               ",this.settings.upload_url,"\n","	","flash_url:                ",this.settings.flash_url,"\n","	","use_query_string:         ",this.settings.use_query_string.toString(),"\n","	","requeue_on_error:         ",this.settings.requeue_on_error.toString(),"\n","	","http_success:             ",this.settings.http_success.join(", "),"\n","	","assume_success_timeout:   ",this.settings.assume_success_timeout,"\n","	","file_post_name:           ",this.settings.file_post_name,"\n","	","post_params:              ",this.settings.post_params.toString(),"\n","	","file_types:               ",this.settings.file_types,"\n","	","file_types_description:   ",this.settings.file_types_description,"\n","	","file_size_limit:          ",this.settings.file_size_limit,"\n","	","file_upload_limit:        ",this.settings.file_upload_limit,"\n","	","file_queue_limit:         ",this.settings.file_queue_limit,"\n","	","debug:                    ",this.settings.debug.toString(),"\n","	","prevent_swf_caching:      ",this.settings.prevent_swf_caching.toString(),"\n","	","button_placeholder_id:    ",this.settings.button_placeholder_id.toString(),"\n","	","button_placeholder:       ",this.settings.button_placeholder?"Set":"Not Set","\n","	","button_image_url:         ",this.settings.button_image_url.toString(),"\n","	","button_width:             ",this.settings.button_width.toString(),"\n","	","button_height:            ",this.settings.button_height.toString(),"\n","	","button_text:              ",this.settings.button_text.toString(),"\n","	","button_text_style:        ",this.settings.button_text_style.toString(),"\n","	","button_text_top_padding:  ",this.settings.button_text_top_padding.toString(),"\n","	","button_text_left_padding: ",this.settings.button_text_left_padding.toString(),"\n","	","button_action:            ",this.settings.button_action.toString(),"\n","	","button_disabled:          ",this.settings.button_disabled.toString(),"\n","	","custom_settings:          ",this.settings.custom_settings.toString(),"\n","Event Handlers:\n","	","swfupload_loaded_handler assigned:  ",("function"==typeof this.settings.swfupload_loaded_handler).toString(),"\n","	","file_dialog_start_handler assigned: ",("function"==typeof this.settings.file_dialog_start_handler).toString(),"\n","	","file_queued_handler assigned:       ",("function"==typeof this.settings.file_queued_handler).toString(),"\n","	","file_queue_error_handler assigned:  ",("function"==typeof this.settings.file_queue_error_handler).toString(),"\n","	","upload_start_handler assigned:      ",("function"==typeof this.settings.upload_start_handler).toString(),"\n","	","upload_progress_handler assigned:   ",("function"==typeof this.settings.upload_progress_handler).toString(),"\n","	","upload_error_handler assigned:      ",("function"==typeof this.settings.upload_error_handler).toString(),"\n","	","upload_success_handler assigned:    ",("function"==typeof this.settings.upload_success_handler).toString(),"\n","	","upload_complete_handler assigned:   ",("function"==typeof this.settings.upload_complete_handler).toString(),"\n","	","debug_handler assigned:             ",("function"==typeof this.settings.debug_handler).toString(),"\n"].join(""))},SWFUpload.prototype.addSetting=function(a,b,c){return this.settings[a]=void 0==b?c:b},SWFUpload.prototype.getSetting=function(a){return void 0!=this.settings[a]?this.settings[a]:""},SWFUpload.prototype.callFlash=function(functionName,argumentArray){argumentArray=argumentArray||[];var movieElement=this.getMovieElement(),returnValue,returnString;try{returnString=movieElement.CallFunction('<invoke name="'+functionName+'" returntype="javascript">'+__flash__argumentsToXML(argumentArray,0)+"</invoke>"),returnValue=eval(returnString)}catch(ex){throw"Call to "+functionName+" failed"}return void 0!=returnValue&&"object"==typeof returnValue.post&&(returnValue=this.unescapeFilePostParams(returnValue)),returnValue},SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")},SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")},SWFUpload.prototype.startUpload=function(a){this.callFlash("StartUpload",[a])},SWFUpload.prototype.cancelUpload=function(a,b){b!==!1&&(b=!0),this.callFlash("CancelUpload",[a,b])},SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")},SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")},SWFUpload.prototype.setStats=function(a){this.callFlash("SetStats",[a])},SWFUpload.prototype.getFile=function(a){return"number"==typeof a?this.callFlash("GetFileByIndex",[a]):this.callFlash("GetFile",[a])},SWFUpload.prototype.addFileParam=function(a,b,c){return this.callFlash("AddFileParam",[a,b,c])},SWFUpload.prototype.removeFileParam=function(a,b){this.callFlash("RemoveFileParam",[a,b])},SWFUpload.prototype.setUploadURL=function(a){this.settings.upload_url=a.toString(),this.callFlash("SetUploadURL",[a])},SWFUpload.prototype.setPostParams=function(a){this.settings.post_params=a,this.callFlash("SetPostParams",[a])},SWFUpload.prototype.addPostParam=function(a,b){this.settings.post_params[a]=b,this.callFlash("SetPostParams",[this.settings.post_params])},SWFUpload.prototype.removePostParam=function(a){delete this.settings.post_params[a],this.callFlash("SetPostParams",[this.settings.post_params])},SWFUpload.prototype.setFileTypes=function(a,b){this.settings.file_types=a,this.settings.file_types_description=b,this.callFlash("SetFileTypes",[a,b])},SWFUpload.prototype.setFileSizeLimit=function(a){this.settings.file_size_limit=a,this.callFlash("SetFileSizeLimit",[a])},SWFUpload.prototype.setFileUploadLimit=function(a){this.settings.file_upload_limit=a,this.callFlash("SetFileUploadLimit",[a])},SWFUpload.prototype.setFileQueueLimit=function(a){this.settings.file_queue_limit=a,this.callFlash("SetFileQueueLimit",[a])},SWFUpload.prototype.setFilePostName=function(a){this.settings.file_post_name=a,this.callFlash("SetFilePostName",[a])},SWFUpload.prototype.setUseQueryString=function(a){this.settings.use_query_string=a,this.callFlash("SetUseQueryString",[a])},SWFUpload.prototype.setRequeueOnError=function(a){this.settings.requeue_on_error=a,this.callFlash("SetRequeueOnError",[a])},SWFUpload.prototype.setHTTPSuccess=function(a){"string"==typeof a&&(a=a.replace(" ","").split(",")),this.settings.http_success=a,this.callFlash("SetHTTPSuccess",[a])},SWFUpload.prototype.setAssumeSuccessTimeout=function(a){this.settings.assume_success_timeout=a,this.callFlash("SetAssumeSuccessTimeout",[a])},SWFUpload.prototype.setDebugEnabled=function(a){this.settings.debug_enabled=a,this.callFlash("SetDebugEnabled",[a])},SWFUpload.prototype.setButtonImageURL=function(a){void 0==a&&(a=""),this.settings.button_image_url=a,this.callFlash("SetButtonImageURL",[a])},SWFUpload.prototype.setButtonDimensions=function(a,b){this.settings.button_width=a,this.settings.button_height=b;var c=this.getMovieElement();void 0!=c&&(c.style.width=a+"px",c.style.height=b+"px"),this.callFlash("SetButtonDimensions",[a,b])},SWFUpload.prototype.setButtonText=function(a){this.settings.button_text=a,this.callFlash("SetButtonText",[a])},SWFUpload.prototype.setButtonTextPadding=function(a,b){this.settings.button_text_top_padding=b,this.settings.button_text_left_padding=a,this.callFlash("SetButtonTextPadding",[a,b])},SWFUpload.prototype.setButtonTextStyle=function(a){this.settings.button_text_style=a,this.callFlash("SetButtonTextStyle",[a])},SWFUpload.prototype.setButtonDisabled=function(a){this.settings.button_disabled=a,this.callFlash("SetButtonDisabled",[a])},SWFUpload.prototype.setButtonAction=function(a){this.settings.button_action=a,this.callFlash("SetButtonAction",[a])},SWFUpload.prototype.setButtonCursor=function(a){this.settings.button_cursor=a,this.callFlash("SetButtonCursor",[a])},SWFUpload.prototype.queueEvent=function(a,b){void 0==b?b=[]:b instanceof Array||(b=[b]);var c=this;if("function"==typeof this.settings[a])this.eventQueue.push(function(){this.settings[a].apply(this,b)
+}),setTimeout(function(){c.executeNextEvent()},0);else if(null!==this.settings[a])throw"Event handler "+a+" is unknown or is not a function"},SWFUpload.prototype.executeNextEvent=function(){var a=this.eventQueue?this.eventQueue.shift():null;"function"==typeof a&&a.apply(this)},SWFUpload.prototype.unescapeFilePostParams=function(a){var b,c=/[$]([0-9a-f]{4})/i,d={};if(void 0!=a){for(var e in a.post)if(a.post.hasOwnProperty(e)){b=e;for(var f;null!==(f=c.exec(b));)b=b.replace(f[0],String.fromCharCode(parseInt("0x"+f[1],16)));d[b]=a.post[e]}a.post=d}return a},SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(a){return!1}},SWFUpload.prototype.flashReady=function(){var a=this.getMovieElement();return a?(this.cleanUp(a),void this.queueEvent("swfupload_loaded_handler")):void this.debug("Flash called back ready but the flash movie can't be found.")},SWFUpload.prototype.cleanUp=function(a){try{if(this.movieElement&&"unknown"==typeof a.CallFunction){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(var b in a)try{"function"==typeof a[b]&&(a[b]=null)}catch(c){}}}catch(d){}window.__flash__removeCallback=function(a,b){try{a&&(a[b]=null)}catch(c){}}},SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")},SWFUpload.prototype.fileQueued=function(a){a=this.unescapeFilePostParams(a),this.queueEvent("file_queued_handler",a)},SWFUpload.prototype.fileQueueError=function(a,b,c){a=this.unescapeFilePostParams(a),this.queueEvent("file_queue_error_handler",[a,b,c])},SWFUpload.prototype.fileDialogComplete=function(a,b,c){this.queueEvent("file_dialog_complete_handler",[a,b,c])},SWFUpload.prototype.uploadStart=function(a){a=this.unescapeFilePostParams(a),this.queueEvent("return_upload_start_handler",a)},SWFUpload.prototype.returnUploadStart=function(a){var b;if("function"==typeof this.settings.upload_start_handler)a=this.unescapeFilePostParams(a),b=this.settings.upload_start_handler.call(this,a);else if(void 0!=this.settings.upload_start_handler)throw"upload_start_handler must be a function";void 0===b&&(b=!0),b=!!b,this.callFlash("ReturnUploadStart",[b])},SWFUpload.prototype.uploadProgress=function(a,b,c){a=this.unescapeFilePostParams(a),this.queueEvent("upload_progress_handler",[a,b,c])},SWFUpload.prototype.uploadError=function(a,b,c){a=this.unescapeFilePostParams(a),this.queueEvent("upload_error_handler",[a,b,c])},SWFUpload.prototype.uploadSuccess=function(a,b,c){a=this.unescapeFilePostParams(a),this.queueEvent("upload_success_handler",[a,b,c])},SWFUpload.prototype.uploadComplete=function(a){a=this.unescapeFilePostParams(a),this.queueEvent("upload_complete_handler",a)},SWFUpload.prototype.debug=function(a){this.queueEvent("debug_handler",a)},SWFUpload.prototype.debugMessage=function(a){if(this.settings.debug){var b,c=[];if("object"==typeof a&&"string"==typeof a.name&&"string"==typeof a.message){for(var d in a)a.hasOwnProperty(d)&&c.push(d+": "+a[d]);b=c.join("\n")||"",c=b.split("\n"),b="EXCEPTION: "+c.join("\nEXCEPTION: "),SWFUpload.Console.writeLine(b)}else SWFUpload.Console.writeLine(a)}},SWFUpload.Console={},SWFUpload.Console.writeLine=function(a){var b,c;try{b=document.getElementById("SWFUpload_Console"),b||(c=document.createElement("form"),document.getElementsByTagName("body")[0].appendChild(c),b=document.createElement("textarea"),b.id="SWFUpload_Console",b.style.fontFamily="monospace",b.setAttribute("wrap","off"),b.wrap="off",b.style.overflow="auto",b.style.width="700px",b.style.height="350px",b.style.margin="5px",c.appendChild(b)),b.value+=a+"\n",b.scrollTop=b.scrollHeight-b.clientHeight}catch(d){alert("Exception: "+d.name+" Message: "+d.message)}}}(),function(){"function"==typeof SWFUpload&&(SWFUpload.queue={},SWFUpload.prototype.initSettings=function(a){return function(){"function"==typeof a&&a.call(this),this.queueSettings={},this.queueSettings.queue_cancelled_flag=!1,this.queueSettings.queue_upload_count=0,this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler,this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler,this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler,this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler,this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}}(SWFUpload.prototype.initSettings),SWFUpload.prototype.startUpload=function(a){this.queueSettings.queue_cancelled_flag=!1,this.callFlash("StartUpload",[a])},SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=!0,this.stopUpload();for(var a=this.getStats();a.files_queued>0;)this.cancelUpload(),a=this.getStats()},SWFUpload.queue.uploadStartHandler=function(a){var b;return"function"==typeof this.queueSettings.user_upload_start_handler&&(b=this.queueSettings.user_upload_start_handler.call(this,a)),b=b===!1?!1:!0,this.queueSettings.queue_cancelled_flag=!b,b},SWFUpload.queue.uploadCompleteHandler=function(a){var b,c=this.queueSettings.user_upload_complete_handler;if(a.filestatus===SWFUpload.FILE_STATUS.COMPLETE&&this.queueSettings.queue_upload_count++,b="function"==typeof c?c.call(this,a)===!1?!1:!0:a.filestatus===SWFUpload.FILE_STATUS.QUEUED?!1:!0){var d=this.getStats();d.files_queued>0&&this.queueSettings.queue_cancelled_flag===!1?this.startUpload():this.queueSettings.queue_cancelled_flag===!1?(this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]),this.queueSettings.queue_upload_count=0):(this.queueSettings.queue_cancelled_flag=!1,this.queueSettings.queue_upload_count=0)}})}(),KindEditor.plugin("pagebreak",function(a){var b=this,c="pagebreak",d=a.undef(b.pagebreakHtml,'<hr style="page-break-after: always;" class="ke-pagebreak" />');b.clickToolbar(c,function(){var c=b.cmd,e=c.range;b.focus();var f="br"==b.newlineTag||a.WEBKIT?"":'<span id="__kindeditor_tail_tag__"></span>';if(b.insertHtml(d+f),""!==f){var g=a("#__kindeditor_tail_tag__",b.edit.doc);e.selectNodeContents(g[0]),g.removeAttr("id"),c.select()}})}),KindEditor.plugin("plainpaste",function(a){var b=this,c="plainpaste";b.clickToolbar(c,function(){var d=b.lang(c+"."),e='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.comment+'</div><textarea class="ke-textarea" style="width:408px;height:260px;"></textarea></div>',f=b.createDialog({name:c,width:450,title:b.lang(c),body:e,yesBtn:{name:b.lang("yes"),click:function(){var c=g.val();c=a.escape(c),c=c.replace(/ {2}/g," &nbsp;"),c="p"==b.newlineTag?c.replace(/^/,"<p>").replace(/$/,"</p>").replace(/\n/g,"</p><p>"):c.replace(/\n/g,"<br />$&"),b.insertHtml(c).hideDialog().focus()}}}),g=a("textarea",f.div);g[0].focus()})}),KindEditor.plugin("preview",function(a){var b=this,c="preview";b.clickToolbar(c,function(){var d=(b.lang(c+"."),'<div style="padding:10px 20px;"><iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe></div>'),e=b.createDialog({name:c,width:750,title:b.lang(c),body:d}),f=a("iframe",e.div),g=a.iframeDoc(f);g.open(),g.write(b.fullHtml()),g.close(),a(g.body).css("background-color","#FFF"),f[0].contentWindow.focus()})}),KindEditor.plugin("quickformat",function(a){function b(a){for(var b=a.first();b&&b.first();)b=b.first();return b}var c=this,d="quickformat",e=a.toMap("blockquote,center,div,h1,h2,h3,h4,h5,h6,p");c.clickToolbar(d,function(){c.focus();for(var d,f=c.edit.doc,g=c.cmd.range,h=a(f.body).first(),i=[],j=[],k=g.createBookmark(!0);h;){d=h.next();var l=b(h);l&&"img"==l.name||(e[h.name]?(h.html(h.html().replace(/^(\s|&nbsp;|　)+/gi,"")),h.css("text-indent","2em")):j.push(h),(!d||e[d.name]||e[h.name]&&!e[d.name])&&(j.length>0&&i.push(j),j=[])),h=d}a.each(i,function(b,c){var d=a('<p style="text-indent:2em;"></p>',f);c[0].before(d),a.each(c,function(a,b){d.append(b)})}),g.moveToBookmark(k),c.addBookmark()})}),KindEditor.plugin("table",function(a){function b(a,b){b=b.toUpperCase(),a.css("background-color",b),a.css("color","#000000"===b?"#FFFFFF":"#000000"),a.html(b)}function c(c,d){function f(){a.each(i,function(){this.remove()}),i=[],a(document).unbind("click,mousedown",f),c.unbind("click,mousedown",f)}d.bind("click,mousedown",function(a){a.stopPropagation()}),d.click(function(){f();var d=a(this),g=d.pos(),h=a.colorpicker({x:g.x,y:g.y+d.height(),z:811214,selectedColor:a(this).html(),colors:e.colorTable,noColor:e.lang("noColor"),shadowMode:e.shadowMode,click:function(a){b(d,a),f()}});i.push(h),a(document).bind("click,mousedown",f),c.bind("click,mousedown",f)})}function d(a,b,c){for(var d=0,e=0,f=b.cells.length;f>e&&b.cells[e]!=c;e++)d+=b.cells[e].rowSpan-1;return c.cellIndex-d}var e=this,f="table",g=e.lang(f+"."),h="ke-zeroborder",i=[];e.plugin.table={prop:function(d){var i=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keRows" style="width:90px;">'+g.cells+"</label>",g.rows+' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',g.cols+' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',"</div>",'<div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+g.size+"</label>",g.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ','<select name="widthType">','<option value="%">'+g.percent+"</option>",'<option value="px">'+g.px+"</option>","</select> &nbsp; ",g.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ','<select name="heightType">','<option value="%">'+g.percent+"</option>",'<option value="px">'+g.px+"</option>","</select>","</div>",'<div class="ke-dialog-row">','<label for="kePadding" style="width:90px;">'+g.space+"</label>",g.padding+' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',g.spacing+' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',"</div>",'<div class="ke-dialog-row">','<label for="keAlign" style="width:90px;">'+g.align+"</label>",'<select id="keAlign" name="align">','<option value="">'+g.alignDefault+"</option>",'<option value="left">'+g.alignLeft+"</option>",'<option value="center">'+g.alignCenter+"</option>",'<option value="right">'+g.alignRight+"</option>","</select>","</div>",'<div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+g.border+"</label>",g.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',g.borderColor+' <span class="ke-inline-block ke-input-color"></span>',"</div>",'<div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+g.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span>',"</div>","</div>"].join(""),j=e.cmd.range.createBookmark(),k=e.createDialog({name:f,width:500,title:e.lang(f),body:i,beforeRemove:function(){w.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var b=m.val(),c=n.val(),d=o.val(),f=p.val(),g=q.val(),i=r.val(),k=s.val(),l=t.val(),y=u.val(),z=v.val(),A=a(w[0]).html()||"",B=a(w[1]).html()||"";if(0==b||!/^\d+$/.test(b))return alert(e.lang("invalidRows")),void m[0].focus();if(0==c||!/^\d+$/.test(c))return alert(e.lang("invalidRows")),void n[0].focus();if(!/^\d*$/.test(d))return alert(e.lang("invalidWidth")),void o[0].focus();if(!/^\d*$/.test(f))return alert(e.lang("invalidHeight")),void p[0].focus();if(!/^\d*$/.test(k))return alert(e.lang("invalidPadding")),void s[0].focus();if(!/^\d*$/.test(l))return alert(e.lang("invalidSpacing")),void t[0].focus();if(!/^\d*$/.test(z))return alert(e.lang("invalidBorder")),void v[0].focus();if(x)return""!==d?x.width(d+g):x.css("width",""),void 0!==x[0].width&&x.removeAttr("width"),""!==f?x.height(f+i):x.css("height",""),void 0!==x[0].height&&x.removeAttr("height"),x.css("background-color",B),void 0!==x[0].bgColor&&x.removeAttr("bgColor"),""!==k?x[0].cellPadding=k:x.removeAttr("cellPadding"),""!==l?x[0].cellSpacing=l:x.removeAttr("cellSpacing"),""!==y?x[0].align=y:x.removeAttr("align"),""!==z?x.attr("border",z):x.removeAttr("border"),""===z||"0"===z?x.addClass(h):x.removeClass(h),""!==A?x.attr("borderColor",A):x.removeAttr("borderColor"),e.hideDialog().focus(),e.cmd.range.moveToBookmark(j),e.cmd.select(),void e.addBookmark();var C="";""!==d&&(C+="width:"+d+g+";"),""!==f&&(C+="height:"+f+i+";"),""!==B&&(C+="background-color:"+B+";");var D="<table";""!==C&&(D+=' style="'+C+'"'),""!==k&&(D+=' cellpadding="'+k+'"'),""!==l&&(D+=' cellspacing="'+l+'"'),""!==y&&(D+=' align="'+y+'"'),""!==z&&(D+=' border="'+z+'"'),(""===z||"0"===z)&&(D+=' class="'+h+'"'),""!==A&&(D+=' bordercolor="'+A+'"'),D+=">";for(var E=0;b>E;E++){D+="<tr>";for(var F=0;c>F;F++)D+="<td>"+(a.IE?"&nbsp;":"<br />")+"</td>";D+="</tr>"}D+="</table>",a.IE||(D+="<br />"),e.insertHtml(D),e.select().hideDialog().focus(),e.addBookmark()}}}),l=k.div,m=a('[name="rows"]',l).val(3),n=a('[name="cols"]',l).val(2),o=a('[name="width"]',l).val(100),p=a('[name="height"]',l),q=a('[name="widthType"]',l),r=a('[name="heightType"]',l),s=a('[name="padding"]',l).val(2),t=a('[name="spacing"]',l).val(0),u=a('[name="align"]',l),v=a('[name="border"]',l).val(1),w=a(".ke-input-color",l);c(l,w.eq(0)),c(l,w.eq(1)),b(w.eq(0),"#000000"),b(w.eq(1),""),m[0].focus(),m[0].select();var x;if(!d&&(x=e.plugin.getSelectedTable())){m.val(x[0].rows.length),n.val(x[0].rows.length>0?x[0].rows[0].cells.length:0),m.attr("disabled",!0),n.attr("disabled",!0);var y,z=x[0].style.width||x[0].width,A=x[0].style.height||x[0].height;void 0!==z&&(y=/^(\d+)((?:px|%)*)$/.exec(z))?(o.val(y[1]),q.val(y[2])):o.val(""),void 0!==A&&(y=/^(\d+)((?:px|%)*)$/.exec(A))&&(p.val(y[1]),r.val(y[2])),s.val(x[0].cellPadding||""),t.val(x[0].cellSpacing||""),u.val(x[0].align||""),v.val(void 0===x[0].border?"":x[0].border),b(w.eq(0),a.toHex(x.attr("borderColor")||"")),b(w.eq(1),a.toHex(x[0].style.backgroundColor||x[0].bgColor||"")),o[0].focus(),o[0].select()}},cellprop:function(){var d=['<div style="padding:20px;">','<div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+g.size+"</label>",g.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ','<select name="widthType">','<option value="%">'+g.percent+"</option>",'<option value="px">'+g.px+"</option>","</select> &nbsp; ",g.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ','<select name="heightType">','<option value="%">'+g.percent+"</option>",'<option value="px">'+g.px+"</option>","</select>","</div>",'<div class="ke-dialog-row">','<label for="keAlign" style="width:90px;">'+g.align+"</label>",g.textAlign+' <select id="keAlign" name="textAlign">','<option value="">'+g.alignDefault+"</option>",'<option value="left">'+g.alignLeft+"</option>",'<option value="center">'+g.alignCenter+"</option>",'<option value="right">'+g.alignRight+"</option>","</select> ",g.verticalAlign+' <select name="verticalAlign">','<option value="">'+g.alignDefault+"</option>",'<option value="top">'+g.alignTop+"</option>",'<option value="middle">'+g.alignMiddle+"</option>",'<option value="bottom">'+g.alignBottom+"</option>",'<option value="baseline">'+g.alignBaseline+"</option>","</select>","</div>",'<div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+g.border+"</label>",g.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',g.borderColor+' <span class="ke-inline-block ke-input-color"></span>',"</div>",'<div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+g.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span>',"</div>","</div>"].join(""),h=e.cmd.range.createBookmark(),i=e.createDialog({name:f,width:500,title:e.lang("tablecell"),body:d,beforeRemove:function(){t.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var b=k.val(),c=l.val(),d=m.val(),f=n.val(),g=(o.val(),p.val(),q.val()),i=r.val(),j=s.val(),u=a(t[0]).html()||"",w=a(t[1]).html()||"";return/^\d*$/.test(b)?/^\d*$/.test(c)?/^\d*$/.test(j)?(v.css({width:""!==b?b+d:"",height:""!==c?c+f:"","background-color":w,"text-align":g,"vertical-align":i,"border-width":j,"border-style":""!==j?"solid":"","border-color":u}),e.hideDialog().focus(),e.cmd.range.moveToBookmark(h),e.cmd.select(),void e.addBookmark()):(alert(e.lang("invalidBorder")),void s[0].focus()):(alert(e.lang("invalidHeight")),void l[0].focus()):(alert(e.lang("invalidWidth")),void k[0].focus())}}}),j=i.div,k=a('[name="width"]',j).val(100),l=a('[name="height"]',j),m=a('[name="widthType"]',j),n=a('[name="heightType"]',j),o=a('[name="padding"]',j).val(2),p=a('[name="spacing"]',j).val(0),q=a('[name="textAlign"]',j),r=a('[name="verticalAlign"]',j),s=a('[name="border"]',j).val(1),t=a(".ke-input-color",j);c(j,t.eq(0)),c(j,t.eq(1)),b(t.eq(0),"#000000"),b(t.eq(1),""),k[0].focus(),k[0].select();var u,v=e.plugin.getSelectedCell(),w=v[0].style.width||v[0].width||"",x=v[0].style.height||v[0].height||"";(u=/^(\d+)((?:px|%)*)$/.exec(w))?(k.val(u[1]),m.val(u[2])):k.val(""),(u=/^(\d+)((?:px|%)*)$/.exec(x))&&(l.val(u[1]),n.val(u[2])),q.val(v[0].style.textAlign||""),r.val(v[0].style.verticalAlign||"");var y=v[0].style.borderWidth||"";y&&(y=parseInt(y)),s.val(y),b(t.eq(0),a.toHex(v[0].style.borderColor||"")),b(t.eq(1),a.toHex(v[0].style.backgroundColor||"")),k[0].focus(),k[0].select()},insert:function(){this.prop(!0)},"delete":function(){var a=e.plugin.getSelectedTable();e.cmd.range.setStartBefore(a[0]).collapse(!0),e.cmd.select(),a.remove(),e.addBookmark()},colinsert:function(b){var c=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],g=e.plugin.getSelectedCell()[0],h=g.cellIndex+b;h+=c.rows[0].cells.length-f.cells.length;for(var i=0,j=c.rows.length;j>i;i++){var k=c.rows[i],l=k.insertCell(h);l.innerHTML=a.IE?"":"<br />",h=d(c,k,l)}e.cmd.range.selectNodeContents(g).collapse(!0),e.cmd.select(),e.addBookmark()},colinsertleft:function(){this.colinsert(0)},colinsertright:function(){this.colinsert(1)},rowinsert:function(b){var c=e.plugin.getSelectedTable()[0],d=e.plugin.getSelectedRow()[0],f=e.plugin.getSelectedCell()[0],g=d.rowIndex;1===b&&(g=d.rowIndex+(f.rowSpan-1)+b);for(var h=c.insertRow(g),i=0,j=d.cells.length;j>i;i++){d.cells[i].rowSpan>1&&(j-=d.cells[i].rowSpan-1);var k=h.insertCell(i);1===b&&d.cells[i].colSpan>1&&(k.colSpan=d.cells[i].colSpan),k.innerHTML=a.IE?"":"<br />"}for(var l=g;l>=0;l--){var m=c.rows[l].cells;if(m.length>i){for(var n=f.cellIndex;n>=0;n--)m[n].rowSpan>1&&(m[n].rowSpan+=1);break}}e.cmd.range.selectNodeContents(f).collapse(!0),e.cmd.select(),e.addBookmark()},rowinsertabove:function(){this.rowinsert(0)},rowinsertbelow:function(){this.rowinsert(1)},rowmerge:function(){var a=e.plugin.getSelectedTable()[0],b=e.plugin.getSelectedRow()[0],c=e.plugin.getSelectedCell()[0],d=b.rowIndex,f=d+c.rowSpan,g=a.rows[f];if(!(a.rows.length<=f)){var h=c.cellIndex;if(!(g.cells.length<=h)){var i=g.cells[h];c.colSpan===i.colSpan&&(c.rowSpan+=i.rowSpan,g.deleteCell(h),e.cmd.range.selectNodeContents(c).collapse(!0),e.cmd.select(),e.addBookmark())}}},colmerge:function(){var a=(e.plugin.getSelectedTable()[0],e.plugin.getSelectedRow()[0]),b=e.plugin.getSelectedCell()[0],c=(a.rowIndex,b.cellIndex),d=c+1;if(!(a.cells.length<=d)){var f=a.cells[d];b.rowSpan===f.rowSpan&&(b.colSpan+=f.colSpan,a.deleteCell(d),e.cmd.range.selectNodeContents(b).collapse(!0),e.cmd.select(),e.addBookmark())}},rowsplit:function(){var b=e.plugin.getSelectedTable()[0],c=e.plugin.getSelectedRow()[0],f=e.plugin.getSelectedCell()[0],g=c.rowIndex;if(1!==f.rowSpan){for(var h=d(b,c,f),i=1,j=f.rowSpan;j>i;i++){var k=b.rows[g+i],l=k.insertCell(h);f.colSpan>1&&(l.colSpan=f.colSpan),l.innerHTML=a.IE?"":"<br />",h=d(b,k,l)}a(f).removeAttr("rowSpan"),e.cmd.range.selectNodeContents(f).collapse(!0),e.cmd.select(),e.addBookmark()}},colsplit:function(){var b=(e.plugin.getSelectedTable()[0],e.plugin.getSelectedRow()[0]),c=e.plugin.getSelectedCell()[0],d=c.cellIndex;if(1!==c.colSpan){for(var f=1,g=c.colSpan;g>f;f++){var h=b.insertCell(d+f);c.rowSpan>1&&(h.rowSpan=c.rowSpan),h.innerHTML=a.IE?"":"<br />"}a(c).removeAttr("colSpan"),e.cmd.range.selectNodeContents(c).collapse(!0),e.cmd.select(),e.addBookmark()}},coldelete:function(){for(var b=e.plugin.getSelectedTable()[0],c=e.plugin.getSelectedRow()[0],d=e.plugin.getSelectedCell()[0],f=d.cellIndex,g=0,h=b.rows.length;h>g;g++){var i=b.rows[g],j=i.cells[f];j.colSpan>1?(j.colSpan-=1,1===j.colSpan&&a(j).removeAttr("colSpan")):i.deleteCell(f),j.rowSpan>1&&(g+=j.rowSpan-1)}0===c.cells.length?(e.cmd.range.setStartBefore(b).collapse(!0),e.cmd.select(),a(b).remove()):e.cmd.selection(!0),e.addBookmark()},rowdelete:function(){for(var b=e.plugin.getSelectedTable()[0],c=e.plugin.getSelectedRow()[0],d=e.plugin.getSelectedCell()[0],f=c.rowIndex,g=d.rowSpan-1;g>=0;g--)b.deleteRow(f+g);0===b.rows.length?(e.cmd.range.setStartBefore(b).collapse(!0),e.cmd.select(),a(b).remove()):e.cmd.selection(!0),e.addBookmark()}},e.clickToolbar(f,e.plugin.table.prop)}),KindEditor.plugin("template",function(a){function b(b){return e+b+"?ver="+encodeURIComponent(a.DEBUG?a.TIME:a.VERSION)}var c=this,d="template",e=(c.lang(d+"."),c.pluginsPath+d+"/html/");c.clickToolbar(d,function(){var e=c.lang(d+"."),f=['<div style="padding:10px 20px;">','<div class="ke-header">','<div class="ke-left">',e.selectTemplate+" <select>"];a.each(e.fileList,function(a,b){f.push('<option value="'+a+'">'+b+"</option>")}),html=[f.join(""),"</select></div>",'<div class="ke-right">','<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">'+e.replaceContent+"</label>","</div>",'<div class="ke-clearfix"></div>',"</div>",'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',"</div>"].join("");var g=c.createDialog({name:d,width:500,title:c.lang(d),body:html,yesBtn:{name:c.lang("yes"),click:function(){var b=a.iframeDoc(j);c[i[0].checked?"html":"insertHtml"](b.body.innerHTML).hideDialog().focus()}}}),h=a("select",g.div),i=a('[name="replaceFlag"]',g.div),j=a("iframe",g.div);i[0].checked=!0,j.attr("src",b(h.val())),h.change(function(){j.attr("src",b(this.value))})})}),KindEditor.plugin("wordpaste",function(a){var b=this,c="wordpaste";b.clickToolbar(c,function(){var d=b.lang(c+"."),e='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.comment+'</div><iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe></div>',f=b.createDialog({name:c,width:450,title:b.lang(c),body:e,yesBtn:{name:b.lang("yes"),click:function(){var c=i.body.innerHTML;c=a.clearMsWord(c,b.filterMode?b.htmlTags:a.options.htmlTags),b.insertHtml(c).hideDialog().focus()}}}),g=f.div,h=a("iframe",g),i=a.iframeDoc(h);a.IE||(i.designMode="on"),i.open(),i.write("<!doctype html><html><head><title>WordPaste</title></head>"),i.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">'),a.IE||i.write("<br />"),i.write("</body></html>"),i.close(),a.IE&&(i.body.contentEditable="true"),h[0].contentWindow.focus()})}),KindEditor.plugin("fixtoolbar",function(a){function b(){var b=a(".ke-toolbar"),c=b.pos().y;a(window).bind("scroll",function(){"fixed"==b.css("position")?document.body.scrollTop-c<0&&(b.css("position","static"),b.css("top","auto")):b.pos().y-document.body.scrollTop<0&&(b.css("position","fixed"),b.css("top",0))})}var c=this;c.fixToolBar&&(c.isCreated?b():c.afterCreate(b))});
\ No newline at end of file
diff --git a/public/kindeditor/kindeditor-all.js b/public/kindeditor/kindeditor-all.js
new file mode 100644
index 0000000..3be7cff
--- /dev/null
+++ b/public/kindeditor/kindeditor-all.js
@@ -0,0 +1,9901 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2016 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.11 (2016-03-31)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+
+
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.11 (2016-03-31)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^-?\d+(?:\.\d+)?$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+
+
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+
+
+function _getBasePath() {
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/kindeditor[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.lastIndexOf('/') + 1);
+		}
+	}
+	return '';
+}
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh-CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess', 'wmode'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+
+
+var _useCapture = false;
+
+
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+
+
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+
+
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (window.attachEvent) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/\u2003/g, '&emsp;');
+	html = html.replace(/\u3000/g, '&emsp;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+
+
+
+
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+
+
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+
+
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+
+
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_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, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+
+
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+
+
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+
+
+
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+
+
+
+
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+
+
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		if(e.button !== 0 && e.button !== 1) {
+			return;
+		}
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+
+
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+
+
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+
+
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.textarea.hide();
+				self.html(val);
+				var iframe = self.iframe;
+				var height = _removeUnit(self.height);
+				iframe.height(height - 2);
+				iframe.show();
+				setTimeout(function() {
+					iframe.height(height);
+				}, 0);
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+
+
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+
+
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+
+
+
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+
+
+
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+
+
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+
+
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+
+
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+
+
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+
+
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+
+
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+
+
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+
+
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+
+
+
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		var _pluginStatus = this._pluginStatus;
+		if (!_pluginStatus) {
+			_pluginStatus = this._pluginStatus = {};
+		}
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			if(!_pluginStatus[name]) {
+				_plugins[name].call(self, KindEditor);
+				_pluginStatus[name] = 'inited';
+			}
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+				if (!editor._pluginStatus) {
+					editor._pluginStatus = {};
+				}
+				editor._pluginStatus[name] = 'inited';
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+
+
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+
+
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+				div[0].tabIndex = -1;
+				div[0].focus();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+
+
+})(window);
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh-CN');
+KindEditor.options.langType = 'zh-CN';
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+	if (!self.autoHeightMode) {
+		return;
+	}
+	var minHeight;
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+	function init() {
+		minHeight = K.removeUnit(self.height);
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			'<div class="ke-plugin-filemanager-header">',
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="tabs"></div>',
+			'<div class="tab1" style="display:none;">',
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					if (dialog.isLoading) {
+						return;
+					}
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+(function(K) {
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+})(KindEditor);
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh-CN' ? 'select-files-zh-CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh-CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+(function() {
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+		SWFUpload.instances[this.movieName] = this;
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+	return /*currentURL +*/ path + url;
+};
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+	this.ensureDefault("debug_handler", this.debugMessage);
+	this.ensureDefault("custom_settings", {});
+	this.customSettings = this.settings.custom_settings;
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+	if (!this.settings.preserve_relative_urls) {
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+	delete this.ensureDefault;
+};
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+};
+SWFUpload.prototype.getFlashHTML = function () {
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+SWFUpload.prototype.getFlashVars = function () {
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+	return this.movieElement;
+};
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+	return paramStringPairs.join("&amp;");
+};
+SWFUpload.prototype.destroy = function () {
+	try {
+		this.cancelUpload(null, false);
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") {
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+		window[this.movieName] = null;
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+    return "";
+};
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+	return returnValue;
+};
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+	All these functions a Private.
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+SWFUpload.prototype.executeNextEvent = function () {
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+		file.post = unescapedPost;
+	}
+	return file;
+};
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+SWFUpload.prototype.flashReady = function () {
+	var movieElement = this.getMovieElement();
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+	this.cleanUp(movieElement);
+	this.queueEvent("swfupload_loaded_handler");
+};
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") {
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+	}
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+		}
+	};
+};
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+	returnValue = !!returnValue;
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+	The console is automatically scrolled as messages appear.
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+	try {
+		console = document.getElementById("SWFUpload_Console");
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+		console.value += message + "\n";
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+})();
+(function() {
+/*
+	Queue Plug-in
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+	*/
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+			this.queueSettings = {};
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+		returnValue = (returnValue === false) ? false : true;
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+		return returnValue;
+	};
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+})();
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			widthBox[0].focus();
+			widthBox[0].select();
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			index += table.rows[0].cells.length - row.cells.length;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex,
+				nextRowIndex = rowIndex + cell.rowSpan,
+				nextRow = table.rows[nextRowIndex];
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex;
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex];
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex,
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
+
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
+
+
+KindEditor.plugin('fixtoolbar', function (K) {
+    var self = this;
+    if (!self.fixToolBar) {
+        return;
+    }
+    function init() {
+        var toolbar = K('.ke-toolbar');
+        var originY = toolbar.pos().y;
+        K(window).bind('scroll', function () {
+            if (toolbar.css('position') == 'fixed') {
+                if(document.body.scrollTop - originY < 0){
+                    toolbar.css('position', 'static');
+                    toolbar.css('top', 'auto');
+                }
+            } else {
+                if (toolbar.pos().y - document.body.scrollTop < 0) {
+                    toolbar.css('position', 'fixed');
+                    toolbar.css('top', 0);
+                }
+            }
+        });
+    }
+    if (self.isCreated) {
+        init();
+    } else {
+        self.afterCreate(init);
+    }
+});
+
diff --git a/public/kindeditor/lang/ar.js b/public/kindeditor/lang/ar.js
new file mode 100644
index 0000000..6eb4b7e
--- /dev/null
+++ b/public/kindeditor/lang/ar.js
@@ -0,0 +1,242 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* Arabic Translation By daif alotaibi (http://daif.net/)
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'عرض المصدر',
+	preview : 'معاينة الصفحة',
+	undo : 'تراجع(Ctrl+Z)',
+	redo : 'إعادة التراجع(Ctrl+Y)',
+	cut : 'قص(Ctrl+X)',
+	copy : 'نسخ(Ctrl+C)',
+	paste : 'لصق(Ctrl+V)',
+	plainpaste : 'لصق كنص عادي',
+	wordpaste : 'لصق من مايكروسفت ورد',
+	selectall : 'تحديد الكل',
+	justifyleft : 'محاذاه لليسار',
+	justifycenter : 'محاذاه للوسط',
+	justifyright : 'محاذاه لليمين',
+	justifyfull : 'محاذاه تلقائية',
+	insertorderedlist : 'قائمة مرقمه',
+	insertunorderedlist : 'قائمة نقطية',
+	indent : 'إزاحه النص',
+	outdent : 'إلغاء الازاحة',
+	subscript : 'أسفل النص',
+	superscript : 'أعلى النص',
+	formatblock : 'Paragraph format',
+	fontname : 'نوع الخط',
+	fontsize : 'حجم الخط',
+	forecolor : 'لون النص',
+	hilitecolor : 'لون خلفية النص',
+	bold : 'عريض(Ctrl+B)',
+	italic : 'مائل(Ctrl+I)',
+	underline : 'خط تحت النص(Ctrl+U)',
+	strikethrough : 'خط على النص',
+	removeformat : 'إزالة التنسيق',
+	image : 'إدراج صورة',
+	multiimage : 'Multi image',
+	flash : 'إدراج فلاش',
+	media : 'إدراج وسائط متعددة',
+	table : 'إدراج جدول',
+	tablecell : 'خلية',
+	hr : 'إدراج خط أفقي',
+	emoticons : 'إدراج وجه ضاحك',
+	link : 'رابط',
+	unlink : 'إزالة الرابط',
+	fullscreen : 'محرر ملئ الشاشة',
+	about : 'حول',
+	print : 'طباعة',
+	filemanager : 'مدير الملفات',
+	code : 'إدراج نص برمجي',
+	map : 'خرائط قووقل',
+	baidumap : 'خرائط قووقل',
+	lineheight : 'إرتفاع السطر',
+	clearhtml : 'مسح كود HTML',
+	pagebreak : 'إدراج فاصل صفحات',
+	quickformat : 'تنسيق سريع',
+	insertfile : 'إدراج ملف',
+	template : 'إدراج قالب',
+	anchor : 'رابط',
+	yes : 'موافق',
+	no : 'إلغاء',
+	close : 'إغلاق',
+	editImage : 'خصائص الصورة',
+	deleteImage : 'حذفالصورة',
+	editFlash : 'خصائص الفلاش',
+	deleteFlash : 'حذف الفلاش',
+	editMedia : 'خصائص الوسائط',
+	deleteMedia : 'حذف الوسائط',
+	editLink : 'خصائص الرابط',
+	deleteLink : 'إزالة الرابط',
+	editAnchor : 'Anchor properties',
+	deleteAnchor : 'Delete Anchor',
+	tableprop : 'خصائص الجدول',
+	tablecellprop : 'خصائص الخلية',
+	tableinsert : 'إدراج جدول',
+	tabledelete : 'حذف جدول',
+	tablecolinsertleft : 'إدراج عمود لليسار',
+	tablecolinsertright : 'إدراج عمود لليسار',
+	tablerowinsertabove : 'إدراج صف للأعلى',
+	tablerowinsertbelow : 'إدراج صف للأسفل',
+	tablerowmerge : 'دمج للأسفل',
+	tablecolmerge : 'دمج لليمين',
+	tablerowsplit : 'تقسم الصف',
+	tablecolsplit : 'تقسيم العمود',
+	tablecoldelete : 'حذف العمود',
+	tablerowdelete : 'حذف الصف',
+	noColor : 'إفتراضي',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: jpg,gif,bmp,png",
+	invalidMedia : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "العرض يجب أن يكون رقم.",
+	invalidHeight : "الإرتفاع يجب أن يكون رقم.",
+	invalidBorder : "عرض الحد يجب أن يكون رقم.",
+	invalidUrl : "الرجاء إدخال رابط حيح.",
+	invalidRows : 'صفوف غير صحيح.',
+	invalidCols : 'أعمدة غير صحيحة.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'تم رفع الملف بنجاح.',
+	cutError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+X).',
+	copyError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+C).',
+	pasteError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+V).',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'wordpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'الرابط',
+	'link.linkType' : 'الهدف',
+	'link.newWindow' : 'نافذة جديدة',
+	'link.selfWindow' : 'نفس النافذة',
+	'flash.url' : 'الرابط',
+	'flash.width' : 'العرض',
+	'flash.height' : 'الإرتفاع',
+	'flash.upload' : 'رفع',
+	'flash.viewServer' : 'أستعراض',
+	'media.url' : 'الرابط',
+	'media.width' : 'العرض',
+	'media.height' : 'الإرتفاع',
+	'media.autostart' : 'تشغيل تلقائي',
+	'media.upload' : 'رفع',
+	'media.viewServer' : 'أستعراض',
+	'image.remoteImage' : 'إدراج الرابط',
+	'image.localImage' : 'رفع',
+	'image.remoteUrl' : 'الرابط',
+	'image.localUrl' : 'الملف',
+	'image.size' : 'الحجم',
+	'image.width' : 'العرض',
+	'image.height' : 'الإرتفاع',
+	'image.resetSize' : 'إستعادة الأبعاد',
+	'image.align' : 'محاذاة',
+	'image.defaultAlign' : 'الإفتراضي',
+	'image.leftAlign' : 'اليسار',
+	'image.rightAlign' : 'اليمين',
+	'image.imgTitle' : 'العنوان',
+	'image.upload' : 'أستعراض',
+	'image.viewServer' : 'أستعراض',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'فارغ',
+	'filemanager.moveup' : 'المجلد الأب',
+	'filemanager.viewType' : 'العرض: ',
+	'filemanager.viewImage' : 'مصغرات',
+	'filemanager.listImage' : 'قائمة',
+	'filemanager.orderType' : 'الترتيب: ',
+	'filemanager.fileName' : 'بالإسم',
+	'filemanager.fileSize' : 'بالحجم',
+	'filemanager.fileType' : 'بالنوع',
+	'insertfile.url' : 'الرابط',
+	'insertfile.title' : 'العنوان',
+	'insertfile.upload' : 'رفع',
+	'insertfile.viewServer' : 'أستعراض',
+	'table.cells' : 'خلايا',
+	'table.rows' : 'صفوف',
+	'table.cols' : 'أعمدة',
+	'table.size' : 'الأبعاد',
+	'table.width' : 'العرض',
+	'table.height' : 'الإرتفاع',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'الخارج',
+	'table.padding' : 'الداخل',
+	'table.spacing' : 'الفراغات',
+	'table.align' : 'محاذاه',
+	'table.textAlign' : 'افقى',
+	'table.verticalAlign' : 'رأسي',
+	'table.alignDefault' : 'إفتراضي',
+	'table.alignLeft' : 'يسار',
+	'table.alignCenter' : 'وسط',
+	'table.alignRight' : 'يمين',
+	'table.alignTop' : 'أعلى',
+	'table.alignMiddle' : 'منتصف',
+	'table.alignBottom' : 'أسفل',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'الحدود',
+	'table.borderWidth' : 'العرض',
+	'table.borderColor' : 'اللون',
+	'table.backgroundColor' : 'الخلفية',
+	'map.address' : 'العنوان: ',
+	'map.search' : 'بحث',
+	'baidumap.address' : 'العنوان: ',
+	'baidumap.search' : 'بحث',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'إسم الرابط',
+	'formatblock.formatBlock' : {
+		h1 : 'عنوان 1',
+		h2 : 'عنوان 2',
+		h3 : 'عنوان 3',
+		h4 : 'عنوان 4',
+		p : 'عادي'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'إرتفاع السطر 1'},
+		{'1.5' : 'إرتفاع السطر 1.5'},
+		{'2' : 'إرتفاع السطر 2'},
+		{'2.5' : 'إرتفاع السطر 2.5'},
+		{'3' : 'إرتفاع السطر 3'}
+	],
+	'template.selectTemplate' : 'قالب',
+	'template.replaceContent' : 'إستبدال المحتوى الحالي',
+	'template.fileList' : {
+		'1.html' : 'صورة ونص',
+		'2.html' : 'جدول',
+		'3.html' : 'قائمة'
+	}
+}, 'ar');
+
+KindEditor.each(KindEditor.options.items, function(i, name) {
+	if (name == 'baidumap') {
+		KindEditor.options.items[i] = 'map';
+	}
+});
+KindEditor.options.langType = 'ar';
\ No newline at end of file
diff --git a/public/kindeditor/lang/en.js b/public/kindeditor/lang/en.js
new file mode 100644
index 0000000..86639d2
--- /dev/null
+++ b/public/kindeditor/lang/en.js
@@ -0,0 +1,241 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'Source',
+	preview : 'Preview',
+	undo : 'Undo(Ctrl+Z)',
+	redo : 'Redo(Ctrl+Y)',
+	cut : 'Cut(Ctrl+X)',
+	copy : 'Copy(Ctrl+C)',
+	paste : 'Paste(Ctrl+V)',
+	plainpaste : 'Paste as plain text',
+	wordpaste : 'Paste from Word',
+	selectall : 'Select all',
+	justifyleft : 'Align left',
+	justifycenter : 'Align center',
+	justifyright : 'Align right',
+	justifyfull : 'Align full',
+	insertorderedlist : 'Ordered list',
+	insertunorderedlist : 'Unordered list',
+	indent : 'Increase indent',
+	outdent : 'Decrease indent',
+	subscript : 'Subscript',
+	superscript : 'Superscript',
+	formatblock : 'Paragraph format',
+	fontname : 'Font family',
+	fontsize : 'Font size',
+	forecolor : 'Text color',
+	hilitecolor : 'Highlight color',
+	bold : 'Bold(Ctrl+B)',
+	italic : 'Italic(Ctrl+I)',
+	underline : 'Underline(Ctrl+U)',
+	strikethrough : 'Strikethrough',
+	removeformat : 'Remove format',
+	image : 'Image',
+	multiimage : 'Multi image',
+	flash : 'Flash',
+	media : 'Embeded media',
+	table : 'Table',
+	tablecell : 'Cell',
+	hr : 'Insert horizontal line',
+	emoticons : 'Insert emoticon',
+	link : 'Link',
+	unlink : 'Unlink',
+	fullscreen : 'Toggle fullscreen mode',
+	about : 'About',
+	print : 'Print',
+	filemanager : 'File Manager',
+	code : 'Insert code',
+	map : 'Google Maps',
+	baidumap : 'Baidu Maps',
+	lineheight : 'Line height',
+	clearhtml : 'Clear HTML code',
+	pagebreak : 'Insert Page Break',
+	quickformat : 'Quick Format',
+	insertfile : 'Insert file',
+	template : 'Insert Template',
+	anchor : 'Anchor',
+	yes : 'OK',
+	no : 'Cancel',
+	close : 'Close',
+	editImage : 'Image properties',
+	deleteImage : 'Delete image',
+	editFlash : 'Flash properties',
+	deleteFlash : 'Delete flash',
+	editMedia : 'Media properties',
+	deleteMedia : 'Delete media',
+	editLink : 'Link properties',
+	deleteLink : 'Unlink',
+	editAnchor : 'Anchor properties',
+	deleteAnchor : 'Delete Anchor',
+	tableprop : 'Table properties',
+	tablecellprop : 'Cell properties',
+	tableinsert : 'Insert table',
+	tabledelete : 'Delete table',
+	tablecolinsertleft : 'Insert column left',
+	tablecolinsertright : 'Insert column right',
+	tablerowinsertabove : 'Insert row above',
+	tablerowinsertbelow : 'Insert row below',
+	tablerowmerge : 'Merge down',
+	tablecolmerge : 'Merge right',
+	tablerowsplit : 'Split row',
+	tablecolsplit : 'Split column',
+	tablecoldelete : 'Delete column',
+	tablerowdelete : 'Delete row',
+	noColor : 'Default',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "Please type valid URL.\nAllowed file extension: jpg,gif,bmp,png",
+	invalidMedia : "Please type valid URL.\nAllowed file extension: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "The width must be number.",
+	invalidHeight : "The height must be number.",
+	invalidBorder : "The border must be number.",
+	invalidUrl : "Please type valid URL.",
+	invalidRows : 'Invalid rows.',
+	invalidCols : 'Invalid columns.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'Upload success.',
+	cutError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+X) instead.',
+	copyError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+C) instead.',
+	pasteError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+V) instead.',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'wordpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : 'Target',
+	'link.newWindow' : 'New window',
+	'link.selfWindow' : 'Same window',
+	'flash.url' : 'URL',
+	'flash.width' : 'Width',
+	'flash.height' : 'Height',
+	'flash.upload' : 'Upload',
+	'flash.viewServer' : 'Browse',
+	'media.url' : 'URL',
+	'media.width' : 'Width',
+	'media.height' : 'Height',
+	'media.autostart' : 'Auto start',
+	'media.upload' : 'Upload',
+	'media.viewServer' : 'Browse',
+	'image.remoteImage' : 'Insert URL',
+	'image.localImage' : 'Upload',
+	'image.remoteUrl' : 'URL',
+	'image.localUrl' : 'File',
+	'image.size' : 'Size',
+	'image.width' : 'Width',
+	'image.height' : 'Height',
+	'image.resetSize' : 'Reset dimensions',
+	'image.align' : 'Align',
+	'image.defaultAlign' : 'Default',
+	'image.leftAlign' : 'Left',
+	'image.rightAlign' : 'Right',
+	'image.imgTitle' : 'Title',
+	'image.upload' : 'Browse',
+	'image.viewServer' : 'Browse',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'Blank',
+	'filemanager.moveup' : 'Parent folder',
+	'filemanager.viewType' : 'Display: ',
+	'filemanager.viewImage' : 'Thumbnails',
+	'filemanager.listImage' : 'List',
+	'filemanager.orderType' : 'Sorting: ',
+	'filemanager.fileName' : 'By name',
+	'filemanager.fileSize' : 'By size',
+	'filemanager.fileType' : 'By type',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : 'Title',
+	'insertfile.upload' : 'Upload',
+	'insertfile.viewServer' : 'Browse',
+	'table.cells' : 'Cells',
+	'table.rows' : 'Rows',
+	'table.cols' : 'Columns',
+	'table.size' : 'Dimensions',
+	'table.width' : 'Width',
+	'table.height' : 'Height',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'Space',
+	'table.padding' : 'Padding',
+	'table.spacing' : 'Spacing',
+	'table.align' : 'Align',
+	'table.textAlign' : 'Horizontal',
+	'table.verticalAlign' : 'Vertical',
+	'table.alignDefault' : 'Default',
+	'table.alignLeft' : 'Left',
+	'table.alignCenter' : 'Center',
+	'table.alignRight' : 'Right',
+	'table.alignTop' : 'Top',
+	'table.alignMiddle' : 'Middle',
+	'table.alignBottom' : 'Bottom',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'Border',
+	'table.borderWidth' : 'Width',
+	'table.borderColor' : 'Color',
+	'table.backgroundColor' : 'Background',
+	'map.address' : 'Address: ',
+	'map.search' : 'Search',
+	'baidumap.address' : 'Address: ',
+	'baidumap.search' : 'Search',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'Anchor name',
+	'formatblock.formatBlock' : {
+		h1 : 'Heading 1',
+		h2 : 'Heading 2',
+		h3 : 'Heading 3',
+		h4 : 'Heading 4',
+		p : 'Normal'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'Line height 1'},
+		{'1.5' : 'Line height 1.5'},
+		{'2' : 'Line height 2'},
+		{'2.5' : 'Line height 2.5'},
+		{'3' : 'Line height 3'}
+	],
+	'template.selectTemplate' : 'Template',
+	'template.replaceContent' : 'Replace current content',
+	'template.fileList' : {
+		'1.html' : 'Image and Text',
+		'2.html' : 'Table',
+		'3.html' : 'List'
+	}
+}, 'en');
+
+KindEditor.each(KindEditor.options.items, function(i, name) {
+	if (name == 'baidumap') {
+		KindEditor.options.items[i] = 'map';
+	}
+});
+KindEditor.options.langType = 'en';
diff --git a/public/kindeditor/lang/ko.js b/public/kindeditor/lang/ko.js
new file mode 100644
index 0000000..bf5eb22
--- /dev/null
+++ b/public/kindeditor/lang/ko.js
@@ -0,0 +1,246 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Composite <ukjinplant@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '소스',
+	preview : '미리보기',
+	undo : '작업취소(Ctrl+Z)',
+	redo : '작업재개(Ctrl+Y)',
+	cut : '잘라내기(Ctrl+X)',
+	copy : '복사(Ctrl+C)',
+	paste : '붙여넣기(Ctrl+V)',
+	plainpaste : '일반 텍스트로 붙여넣기',
+	wordpaste : '워드 문서로 붙여넣기',
+	selectall : '전체 선택',
+	justifyleft : '왼쪽 정렬',
+	justifycenter : '가운데 정렬',
+	justifyright : '오른쪽 정렬',
+	justifyfull : '양쪽 정렬',
+	insertorderedlist : '순서 목록',
+	insertunorderedlist : '비순서 목록',
+	indent : '들여쓰기',
+	outdent : '내어쓰기',
+	subscript : '아랫첨자',
+	superscript : '윗첨자',
+	formatblock : '문단 형식',
+	fontname : '글꼴',
+	fontsize : '글자 크기',
+	forecolor : '글자색',
+	hilitecolor : '강조색',
+	bold : '굵게(Ctrl+B)',
+	italic : '이텔릭(Ctrl+I)',
+	underline : '빝줄(Ctrl+U)',
+	strikethrough : '취소선',
+	removeformat : '형식 제거',
+	image : '이미지 추가',
+	multiimage : '여러 이미지 추가',
+	flash : '플래시 추가',
+	media : '미디어 추가',
+	table : '표',
+	tablecell : '열',
+	hr : '구분선 추가',
+	emoticons : '이모티콘 추가',
+	link : '링크',
+	unlink : '링크 제거',
+	fullscreen : '전체 화면 모드',
+	about : '이 에디터는...',
+	print : '인쇄',
+	filemanager : '파일 관리자',
+	code : '코드 추가',
+	map : '구글 맵 추가',
+	baidumap : '바이두 맵 추가',
+	lineheight : '행 간격',
+	clearhtml : 'HTML 코드 정리',
+	pagebreak : '페이지 구분 추가',
+	quickformat : '빠른 형식',
+	insertfile : '파일 추가',
+	template : '템플릿 추가',
+	anchor : '책갈피',
+	yes : '확인',
+	no : '취소',
+	close : '닫기',
+	editImage : '이미지 속성',
+	deleteImage : '이미지 삭제',
+	editFlash : '플래시 속성',
+	deleteFlash : '플래시 삭제',
+	editMedia : '미디어 속성',
+	deleteMedia : '미디어 삭제',
+	editLink : '링크 속성',
+	deleteLink : '링크 삭제',
+	editAnchor : 'Anchor properties',
+	deleteAnchor : 'Delete Anchor',
+	tableprop : '표 속성',
+	tablecellprop : '열 속성',
+	tableinsert : '표 추가',
+	tabledelete : '표 삭제',
+	tablecolinsertleft : '왼쪽으로 열 추가',
+	tablecolinsertright : '오른쪽으로 열 추가',
+	tablerowinsertabove : '위쪽으로 열 추가',
+	tablerowinsertbelow : '아래쪽으로 열 추가',
+	tablerowmerge : '아래로 병합',
+	tablecolmerge : '오른쪽으로 병합',
+	tablerowsplit : '행 나누기',
+	tablecolsplit : '열 나누기',
+	tablecoldelete : '열 삭제',
+	tablerowdelete : '행 삭제',
+	noColor : '기본색',
+	pleaseSelectFile : '파일 선택',
+	invalidImg : "올바른 주소를 입력하세요.\njpg,gif,bmp,png 형식이 가능합니다.",
+	invalidMedia : "올바른 주소를 입력하세요.\nswf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb 형식이 가능합니다.",
+	invalidWidth : "넓이 값은 숫자여야 합니다.",
+	invalidHeight : "높이 값은 숫자여야 합니다.",
+	invalidBorder : "굵기 값은 숫자여야 합니다.",
+	invalidUrl : "올바른 주소를 입력하세요.",
+	invalidRows : '올바른 행이 아닙니다.',
+	invalidCols : '올바른 열이 아닙니다.',
+	invalidPadding : '안쪽 여백 값은 숫자여야 합니다.',
+	invalidSpacing : '간격 길이 값은 숫자여야 합니다.',
+	invalidJson : '올바른 JSON 형식이 아닙니다.',
+	uploadSuccess : '업로드가 완료되었습니다.',
+	cutError : '브라우저가 잘라내기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	copyError : '브라우저가 복사 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	pasteError : '브라우저가 붙여넣기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	ajaxLoading : '불러오는 중 ...',
+	uploadLoading : '업로드 중 ...',
+	uploadError : '업로드 오류',
+	'plainpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 텍스트를 붙여넣으세요.',
+	'wordpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 워드 텍스트를 붙여넣으세요.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : '주소',
+	'link.linkType' : '창',
+	'link.newWindow' : '새 창',
+	'link.selfWindow' : '현재 창',
+	'flash.url' : '주소',
+	'flash.width' : '넓이',
+	'flash.height' : '높이',
+	'flash.upload' : '업로드',
+	'flash.viewServer' : '찾아보기',
+	'media.url' : '주소',
+	'media.width' : '넓이',
+	'media.height' : '높이',
+	'media.autostart' : '자동 시작',
+	'media.upload' : '업로드',
+	'media.viewServer' : '찾아보기',
+	'image.remoteImage' : '외부 이미지',
+	'image.localImage' : '내부 이미지',
+	'image.remoteUrl' : '주소',
+	'image.localUrl' : '파일',
+	'image.size' : '크기',
+	'image.width' : '넓이',
+	'image.height' : '높이',
+	'image.resetSize' : '기본 크기로',
+	'image.align' : '정렬',
+	'image.defaultAlign' : '기본',
+	'image.leftAlign' : '왼쪽',
+	'image.rightAlign' : '오른쪽',
+	'image.imgTitle' : '제목',
+	'image.upload' : '찾아보기',
+	'image.viewServer' : '찾아보기',
+	'multiimage.uploadDesc' : '최대 이미지 개수: <%=uploadLimit%>개, 개당 이미지 크기: <%=sizeLimit%>',
+	'multiimage.startUpload' : '업로드 시작',
+	'multiimage.clearAll' : '모두 삭제',
+	'multiimage.insertAll' : '모두 삽입',
+	'multiimage.queueLimitExceeded' : '업로드 개수가 초과되었습니다.',
+	'multiimage.fileExceedsSizeLimit' : '업로드 크기가 초과되었습니다.',
+	'multiimage.zeroByteFile' : '파일 크기가 없습니다.',
+	'multiimage.invalidFiletype' : '올바른 이미지가 아닙니다.',
+	'multiimage.unknownError' : '알 수 없는 업로드 오류가 발생하였습니다.',
+	'multiimage.pending' : '처리 중 ...',
+	'multiimage.uploadError' : '업로드 오류',
+	'filemanager.emptyFolder' : '빈 폴더',
+	'filemanager.moveup' : '위로',
+	'filemanager.viewType' : '보기 방식: ',
+	'filemanager.viewImage' : '미리 보기',
+	'filemanager.listImage' : '목록',
+	'filemanager.orderType' : '정렬 방식: ',
+	'filemanager.fileName' : '이름별',
+	'filemanager.fileSize' : '크기별',
+	'filemanager.fileType' : '종류별',
+	'insertfile.url' : '주소',
+	'insertfile.title' : '제목',
+	'insertfile.upload' : '업로드',
+	'insertfile.viewServer' : '찾아보기',
+	'table.cells' : '열',
+	'table.rows' : '행',
+	'table.cols' : '열',
+	'table.size' : '표 크기',
+	'table.width' : '넓이',
+	'table.height' : '높이',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '간격',
+	'table.padding' : '안쪽여백',
+	'table.spacing' : '간격',
+	'table.align' : '정렬',
+	'table.textAlign' : '수직',
+	'table.verticalAlign' : '수평',
+	'table.alignDefault' : '기본',
+	'table.alignLeft' : '왼쪽',
+	'table.alignCenter' : '가운데',
+	'table.alignRight' : '오른쪽',
+	'table.alignTop' : '위쪽',
+	'table.alignMiddle' : '중간',
+	'table.alignBottom' : '아래쪽',
+	'table.alignBaseline' : '글자기준',
+	'table.border' : '테두리',
+	'table.borderWidth' : '크기',
+	'table.borderColor' : '색상',
+	'table.backgroundColor' : '배경',
+	'map.address' : '주소: ',
+	'map.search' : '검색',
+	'baidumap.address' : '주소: ',
+	'baidumap.search' : '검색',
+	'baidumap.insertDynamicMap' : '동적 지도',
+	'anchor.name' : '책갈피명',
+	'formatblock.formatBlock' : {
+		h1 : '제목 1',
+		h2 : '제목 2',
+		h3 : '제목 3',
+		h4 : '제목 4',
+		p : '본문'
+	},
+	'fontname.fontName' : {
+		'Gulim' : '굴림',
+		'Dotum' : '돋움',
+		'Batang' : '바탕',
+		'Gungsuh' : '궁서',
+		'Malgun Gothic' : '맑은 고딕',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '행간 1'},
+		{'1.5' : '행간 1.5'},
+		{'2' : '행간 2'},
+		{'2.5' : '행간 2.5'},
+		{'3' : '행간 3'}
+	],
+	'template.selectTemplate' : '템플릿',
+	'template.replaceContent' : '내용 바꾸기',
+	'template.fileList' : {
+		'1.html' : '이미지와 텍스트',
+		'2.html' : '표',
+		'3.html' : '목록'
+	}
+}, 'ko');
+
+KindEditor.each(KindEditor.options.items, function(i, name) {
+	if (name == 'baidumap') {
+		KindEditor.options.items[i] = 'map';
+	}
+});
+KindEditor.options.langType = 'ko';
diff --git a/public/kindeditor/lang/ru.js b/public/kindeditor/lang/ru.js
new file mode 100644
index 0000000..dda10bf
--- /dev/null
+++ b/public/kindeditor/lang/ru.js
@@ -0,0 +1,242 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* Translated to Russian by Valery Votintsev (http://codersclub.org/)
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'Source',
+	preview : 'Preview',
+	undo : 'Отмена(Ctrl+Z)',
+	redo : 'Повтор(Ctrl+Y)',
+	cut : 'Вырезать(Ctrl+X)',
+	copy : 'Копировать(Ctrl+C)',
+	paste : 'Вставить(Ctrl+V)',
+	plainpaste : 'Вставить как простой текст',
+	wordpaste : 'Вставить из Word',
+	selectall : 'Выбрать все',
+	justifyleft : 'Выравнивание влево',
+	justifycenter : 'Выравнивание по центру',
+	justifyright : 'Выравнивание вправо',
+	justifyfull : 'Выравнивание по обеим сторонам',
+	insertorderedlist : 'Нумерованый список',
+	insertunorderedlist : 'Ненумерованый список',
+	indent : 'Добавить отступ',
+	outdent : 'Убрать отступ',
+	subscript : 'Надстрочный',
+	superscript : 'Подстрочный',
+	formatblock : 'Формат параграфа',
+	fontname : 'Шрифт',
+	fontsize : 'Размер',
+	forecolor : 'Цвет текста',
+	hilitecolor : 'Цвет фона',
+	bold : 'Жирный(Ctrl+B)',
+	italic : 'Наклонный(Ctrl+I)',
+	underline : 'Подчёркнутый(Ctrl+U)',
+	strikethrough : 'Перечёркнутый',
+	removeformat : 'Удалить формат',
+	image : 'Изображение',
+	multiimage : 'Мульти-загрузка',
+	flash : 'Flash',
+	media : 'Встроенные данные',
+	table : 'Таблица',
+	tablecell : 'Ячейка',
+	hr : 'Горизонтальный разделитель',
+	emoticons : 'Смайл',
+	link : 'Ссылка',
+	unlink : 'Убрать ссылку',
+	fullscreen : 'На весь экран',
+	about : 'О программе',
+	print : 'Печать',
+	filemanager : 'Файлы',
+	code : 'Код',
+	map : 'Карта Google',
+	baidumap : 'Карта Baidu',
+	lineheight : 'Межстрочный интервал',
+	clearhtml : 'Очистить HTML код',
+	pagebreak : 'Разрыв страницы',
+	quickformat : 'Быстрый формат',
+	insertfile : 'Вставить файл',
+	template : 'Вставить шаблон',
+	anchor : 'Якорь',
+	yes : 'OK',
+	no : 'Отмена',
+	close : 'Закрыть',
+	editImage : 'Свойства изображения',
+	deleteImage : 'Удалить изображение',
+	editFlash : 'Свойства Flash',
+	deleteFlash : 'Удалить Flash',
+	editMedia : 'Свойства Media',
+	deleteMedia : 'Удалить Media',
+	editLink : 'Свойства ссылки',
+	deleteLink : 'Удалить ссылку',
+	editAnchor : 'Anchor properties',
+	deleteAnchor : 'Delete Anchor',
+	tableprop : 'Свойства таблицы',
+	tablecellprop : 'Свойства ячейки',
+	tableinsert : 'Вставить таблицу',
+	tabledelete : 'Удалить таблицу',
+	tablecolinsertleft : 'Добавить столбец слева',
+	tablecolinsertright : 'Добавить столбец справа',
+	tablerowinsertabove : 'Добавить строку выше',
+	tablerowinsertbelow : 'Добавить строку ниже',
+	tablerowmerge : 'Объединить вниз',
+	tablecolmerge : 'Объединить вправо',
+	tablerowsplit : 'Разделить строку',
+	tablecolsplit : 'Разделить столбец',
+	tablecoldelete : 'Удалить столбец',
+	tablerowdelete : 'Удалить строку',
+	noColor : 'По умолчанию',
+	pleaseSelectFile : 'Выберите файл.',
+	invalidImg : "Укажите корректный URL изображения.\nРазрешённые форматы: jpg,gif,bmp,png",
+	invalidMedia : "Укажите корректный тип медиа-объекта.\nРазрешённые типы: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "Ширина должна быть числом.",
+	invalidHeight : "Высота должна быть числом.",
+	invalidBorder : "Ширина рамки должна быть числом.",
+	invalidUrl : "Укажите корректный URL.",
+	invalidRows : 'Неверные строки.',
+	invalidCols : 'Неверные столбцы.',
+	invalidPadding : 'padding должен быть числом.',
+	invalidSpacing : 'spacing должен быть числом.',
+	invalidJson : 'Неверная JSON строка.',
+	uploadSuccess : 'Загрузка завершена.',
+	cutError : 'Данная опция не поддерживается вашим браузером, воспользуйтесь комбинацией клавиш (Ctrl+X).',
+	copyError : 'Данная опция не поддерживается вашим браузером, воспользуйтесь комбинацией клавиш (Ctrl+C).',
+	pasteError : 'Данная опция не поддерживается вашим браузером, воспользуйтесь комбинацией клавиш (Ctrl+V).',
+	ajaxLoading : 'Загрузка ...',
+	uploadLoading : 'Загрузка ...',
+	uploadError : 'Сбой загрузки',
+	'plainpaste.comment' : 'Для вставки скопированного текста воспользуйтесь комбинацией клавиш (Ctrl+V).',
+	'wordpaste.comment' : 'Для вставки скопированного текста воспользуйтесь комбинацией клавиш (Ctrl+V).',
+	'code.pleaseInput' : 'Введите код.',
+	'link.url' : 'URL',
+	'link.linkType' : 'Открывать ссылку',
+	'link.newWindow' : 'в новом окне',
+	'link.selfWindow' : 'в том же окне',
+	'flash.url' : 'URL',
+	'flash.width' : 'Ширина',
+	'flash.height' : 'Высота',
+	'flash.upload' : 'Загрузить',
+	'flash.viewServer' : 'Выбрать',
+	'media.url' : 'URL',
+	'media.width' : 'Ширина',
+	'media.height' : 'Высота',
+	'media.autostart' : 'Автостарт',
+	'media.upload' : 'Загрузить',
+	'media.viewServer' : 'Выбрать',
+	'image.remoteImage' : 'Вставить URL изображения',
+	'image.localImage' : 'Загрузить',
+	'image.remoteUrl' : 'URL',
+	'image.localUrl' : 'Файл',
+	'image.size' : 'Размер',
+	'image.width' : 'Ширина',
+	'image.height' : 'Высота',
+	'image.resetSize' : 'Сбросить размеры',
+	'image.align' : 'Выравнивание',
+	'image.defaultAlign' : 'По умолчанию',
+	'image.leftAlign' : 'Влево',
+	'image.rightAlign' : 'Вправо',
+	'image.imgTitle' : 'Название',
+	'image.upload' : 'Загрузить',
+	'image.viewServer' : 'Выбрать',
+	'multiimage.uploadDesc' : 'Максимальное кол-во изображений: <%=uploadLimit%>, Максимальный размер одного изображения: <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Начать загрузку',
+	'multiimage.clearAll' : 'Очистить все',
+	'multiimage.insertAll' : 'Вставить все',
+	'multiimage.queueLimitExceeded' : 'Превышен лимит очереди.',
+	'multiimage.fileExceedsSizeLimit' : 'Превышен максимальный размер файла.',
+	'multiimage.zeroByteFile' : 'Файл нулевой длины.',
+	'multiimage.invalidFiletype' : 'Недопустимый тип файла.',
+	'multiimage.unknownError' : 'Непредвиденная ошибка загрузки.',
+	'multiimage.pending' : 'Ожидает ...',
+	'multiimage.uploadError' : 'Ошибка загрузки',
+	'filemanager.emptyFolder' : 'Папка пуста',
+	'filemanager.moveup' : 'Наверх',
+	'filemanager.viewType' : 'Тип показа: ',
+	'filemanager.viewImage' : 'Превьюшки',
+	'filemanager.listImage' : 'Список',
+	'filemanager.orderType' : 'Сортировка: ',
+	'filemanager.fileName' : 'По имени',
+	'filemanager.fileSize' : 'По размеру',
+	'filemanager.fileType' : 'По типу',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : 'Название',
+	'insertfile.upload' : 'Загрузить',
+	'insertfile.viewServer' : 'Выбрать',
+	'table.cells' : 'Ячейки',
+	'table.rows' : 'Строки',
+	'table.cols' : 'Столбцы',
+	'table.size' : 'Размеры',
+	'table.width' : 'Ширина',
+	'table.height' : 'Высота',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'Space',
+	'table.padding' : 'Padding',
+	'table.spacing' : 'Spacing',
+	'table.align' : 'Выравнивание',
+	'table.textAlign' : 'По горизонтали',
+	'table.verticalAlign' : 'По вертикали',
+	'table.alignDefault' : 'По умолчанию',
+	'table.alignLeft' : 'Влево',
+	'table.alignCenter' : 'По центру',
+	'table.alignRight' : 'Вправо',
+	'table.alignTop' : 'Вверх',
+	'table.alignMiddle' : 'Посередине',
+	'table.alignBottom' : 'Вниз',
+	'table.alignBaseline' : 'По базовой линии',
+	'table.border' : 'Рамка',
+	'table.borderWidth' : 'Ширина',
+	'table.borderColor' : 'Цвет',
+	'table.backgroundColor' : 'Цвет фона',
+	'map.address' : 'Адрес: ',
+	'map.search' : 'Поиск',
+	'baidumap.address' : 'Адрес: ',
+	'baidumap.search' : 'Поиск',
+	'baidumap.insertDynamicMap' : 'Динамическая карта',
+	'anchor.name' : 'Имя якоря',
+	'formatblock.formatBlock' : {
+		h1 : 'Заголовок 1',
+		h2 : 'Заголовок 2',
+		h3 : 'Заголовок 3',
+		h4 : 'Заголовок 4',
+		p : 'Обычный текст'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '1'},
+		{'1.5' : '1.5'},
+		{'2' : '2'},
+		{'2.5' : '2.5'},
+		{'3' : '3'}
+	],
+	'template.selectTemplate' : 'Шаблон',
+	'template.replaceContent' : 'Заменить текущий шаблон',
+	'template.fileList' : {
+		'1.html' : 'Текст и изображения',
+		'2.html' : 'Таблица',
+		'3.html' : 'Список'
+	}
+}, 'en');
+
+KindEditor.each(KindEditor.options.items, function(i, name) {
+	if (name == 'baidumap') {
+		KindEditor.options.items[i] = 'map';
+	}
+});
+KindEditor.options.langType = 'ru';
diff --git a/public/kindeditor/lang/zh-CN.js b/public/kindeditor/lang/zh-CN.js
new file mode 100644
index 0000000..be6527c
--- /dev/null
+++ b/public/kindeditor/lang/zh-CN.js
@@ -0,0 +1,238 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh-CN');
+
+KindEditor.options.langType = 'zh-CN';
\ No newline at end of file
diff --git a/public/kindeditor/lang/zh-TW.js b/public/kindeditor/lang/zh-TW.js
new file mode 100644
index 0000000..4946898
--- /dev/null
+++ b/public/kindeditor/lang/zh-TW.js
@@ -0,0 +1,243 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '原始碼',
+	preview : '預覽',
+	undo : '復原(Ctrl+Z)',
+	redo : '重複(Ctrl+Y)',
+	cut : '剪下(Ctrl+X)',
+	copy : '複製(Ctrl+C)',
+	paste : '貼上(Ctrl+V)',
+	plainpaste : '貼為純文字格式',
+	wordpaste : '自Word貼上',
+	selectall : '全選(Ctrl+A)',
+	justifyleft : '靠左對齊',
+	justifycenter : '置中',
+	justifyright : '靠右對齊',
+	justifyfull : '左右對齊',
+	insertorderedlist : '編號清單',
+	insertunorderedlist : '項目清單',
+	indent : '增加縮排',
+	outdent : '減少縮排',
+	subscript : '下標',
+	superscript : '上標',
+	formatblock : '標題',
+	fontname : '字體',
+	fontsize : '文字大小',
+	forecolor : '文字顏色',
+	hilitecolor : '背景顏色',
+	bold : '粗體(Ctrl+B)',
+	italic : '斜體(Ctrl+I)',
+	underline : '底線(Ctrl+U)',
+	strikethrough : '刪除線',
+	removeformat : '清除格式',
+	image : '影像',
+	multiimage : '批量影像上傳',
+	flash : 'Flash',
+	media : '多媒體',
+	table : '表格',
+	tablecell : '儲存格',
+	hr : '插入水平線',
+	emoticons : '插入表情',
+	link : '超連結',
+	unlink : '移除超連結',
+	fullscreen : '最大化',
+	about : '關於',
+	print : '列印(Ctrl+P)',
+	filemanager : '瀏覽伺服器',
+	code : '插入程式代碼',
+	map : 'Google地圖',
+	baidumap : 'Baidu地圖',
+	lineheight : '行距',
+	clearhtml : '清理HTML代碼',
+	pagebreak : '插入分頁符號',
+	quickformat : '快速排版',
+	insertfile : '插入文件',
+	template : '插入樣板',
+	anchor : '錨點',
+	yes : '確定',
+	no : '取消',
+	close : '關閉',
+	editImage : '影像屬性',
+	deleteImage : '刪除影像',
+	editFlash : 'Flash屬性',
+	deleteFlash : '删除Flash',
+	editMedia : '多媒體屬性',
+	deleteMedia : '删除多媒體',
+	editLink : '超連結屬性',
+	deleteLink : '移除超連結',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格屬性',
+	tablecellprop : '儲存格屬性',
+	tableinsert : '插入表格',
+	tabledelete : '刪除表格',
+	tablecolinsertleft : '向左插入列',
+	tablecolinsertright : '向右插入列',
+	tablerowinsertabove : '向上插入欄',
+	tablerowinsertbelow : '下方插入欄',
+	tablerowmerge : '向下合併單元格',
+	tablecolmerge : '向右合併單元格',
+	tablerowsplit : '分割欄',
+	tablecolsplit : '分割列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除欄',
+	noColor : '自動',
+	pleaseSelectFile : '請選擇文件。',
+	invalidImg : "請輸入有效的URL。\n只允許jpg,gif,bmp,png格式。",
+	invalidMedia : "請輸入有效的URL。\n只允許swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "寬度必須是數字。",
+	invalidHeight : "高度必須是數字。",
+	invalidBorder : "邊框必須是數字。",
+	invalidUrl : "請輸入有效的URL。",
+	invalidRows : '欄數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidCols : '列數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidPadding : '內距必須是數字。',
+	invalidSpacing : '間距必須是數字。',
+	invalidJson : '伺服器發生故障。',
+	uploadSuccess : '上傳成功。',
+	cutError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+X)完成。',
+	copyError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+C)完成。',
+	pasteError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+V)完成。',
+	ajaxLoading : '加載中，請稍候 ...',
+	uploadLoading : '上傳中，請稍候 ...',
+	uploadError : '上傳錯誤',
+	'plainpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'wordpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : '打開類型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '本頁窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '寬度',
+	'flash.height' : '高度',
+	'flash.upload' : '上傳',
+	'flash.viewServer' : '瀏覽',
+	'media.url' : 'URL',
+	'media.width' : '寬度',
+	'media.height' : '高度',
+	'media.autostart' : '自動播放',
+	'media.upload' : '上傳',
+	'media.viewServer' : '瀏覽',
+	'image.remoteImage' : '網絡影像',
+	'image.localImage' : '上傳影像',
+	'image.remoteUrl' : '影像URL',
+	'image.localUrl' : '影像URL',
+	'image.size' : '影像大小',
+	'image.width' : '寬度',
+	'image.height' : '高度',
+	'image.resetSize' : '原始大小',
+	'image.align' : '對齊方式',
+	'image.defaultAlign' : '未設定',
+	'image.leftAlign' : '向左對齊',
+	'image.rightAlign' : '向右對齊',
+	'image.imgTitle' : '影像說明',
+	'image.upload' : '瀏覽...',
+	'image.viewServer' : '瀏覽...',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : '空文件夾',
+	'filemanager.moveup' : '至上一級文件夾',
+	'filemanager.viewType' : '顯示方式：',
+	'filemanager.viewImage' : '縮略圖',
+	'filemanager.listImage' : '詳細信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名稱',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '類型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件說明',
+	'insertfile.upload' : '上傳',
+	'insertfile.viewServer' : '瀏覽',
+	'table.cells' : '儲存格數',
+	'table.rows' : '欄數',
+	'table.cols' : '列數',
+	'table.size' : '表格大小',
+	'table.width' : '寬度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '內距間距',
+	'table.padding' : '內距',
+	'table.spacing' : '間距',
+	'table.align' : '對齊方式',
+	'table.textAlign' : '水平對齊',
+	'table.verticalAlign' : '垂直對齊',
+	'table.alignDefault' : '未設定',
+	'table.alignLeft' : '向左對齊',
+	'table.alignCenter' : '置中',
+	'table.alignRight' : '向右對齊',
+	'table.alignTop' : '靠上',
+	'table.alignMiddle' : '置中',
+	'table.alignBottom' : '靠下',
+	'table.alignBaseline' : '基線',
+	'table.border' : '表格邊框',
+	'table.borderWidth' : '邊框',
+	'table.borderColor' : '顏色',
+	'table.backgroundColor' : '背景顏色',
+	'map.address' : '住所: ',
+	'map.search' : '尋找',
+	'baidumap.address' : '住所: ',
+	'baidumap.search' : '尋找',
+	'baidumap.insertDynamicMap' : '插入動態地圖',
+	'anchor.name' : '錨點名稱',
+	'formatblock.formatBlock' : {
+		h1 : '標題 1',
+		h2 : '標題 2',
+		h3 : '標題 3',
+		h4 : '標題 4',
+		p : '一般'
+	},
+	'fontname.fontName' : {
+		'MingLiU' : '細明體',
+		'PMingLiU' : '新細明體',
+		'DFKai-SB' : '標楷體',
+		'SimSun' : '宋體',
+		'NSimSun' : '新宋體',
+		'FangSong' : '仿宋體',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可選樣板',
+	'template.replaceContent' : '取代當前內容',
+	'template.fileList' : {
+		'1.html' : '影像和文字',
+		'2.html' : '表格',
+		'3.html' : '项目清單'
+	}
+}, 'zh-TW');
+
+KindEditor.each(KindEditor.options.items, function(i, name) {
+	if (name == 'baidumap') {
+		KindEditor.options.items[i] = 'map';
+	}
+});
+KindEditor.options.langType = 'zh-TW';
\ No newline at end of file
diff --git a/public/kindeditor/license.txt b/public/kindeditor/license.txt
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/public/kindeditor/license.txt
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/public/kindeditor/php/JSON.php b/public/kindeditor/php/JSON.php
new file mode 100644
index 0000000..0cddbdd
--- /dev/null
+++ b/public/kindeditor/php/JSON.php
@@ -0,0 +1,806 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in  Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package     Services_JSON
+ * @author      Michal Migurski <mike-json@teczno.com>
+ * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright   2005 Michal Migurski
+ * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @license     http://www.opensource.org/licenses/bsd-license.php
+ * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_SLICE',   1);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_STR',  2);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_ARR',  3);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_OBJ',  4);
+
+/**
+ * Marker constant for Services_JSON::decode(), used to flag stack state
+ */
+define('SERVICES_JSON_IN_CMT', 5);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_LOOSE_TYPE', 16);
+
+/**
+ * Behavior switch for Services_JSON::decode()
+ */
+define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
+
+/**
+ * Converts to and from JSON format.
+ *
+ * Brief example of use:
+ *
+ * <code>
+ * // create a new instance of Services_JSON
+ * $json = new Services_JSON();
+ *
+ * // convert a complexe value to JSON notation, and send it to the browser
+ * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
+ * $output = $json->encode($value);
+ *
+ * print($output);
+ * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
+ *
+ * // accept incoming POST data, assumed to be in JSON notation
+ * $input = file_get_contents('php://input', 1000000);
+ * $value = $json->decode($input);
+ * </code>
+ */
+class Services_JSON
+{
+   /**
+    * constructs a new JSON instance
+    *
+    * @param    int     $use    object behavior flags; combine with boolean-OR
+    *
+    *                           possible values:
+    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+    *                                   "{...}" syntax creates associative arrays
+    *                                   instead of objects in decode().
+    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+    *                                   Values which can't be encoded (e.g. resources)
+    *                                   appear as NULL instead of throwing errors.
+    *                                   By default, a deeply-nested resource will
+    *                                   bubble up with an error, so all return values
+    *                                   from encode() should be checked with isError()
+    */
+    function Services_JSON($use = 0)
+    {
+        $this->use = $use;
+    }
+
+   /**
+    * convert a string from one UTF-16 char to one UTF-8 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf16  UTF-16 character
+    * @return   string  UTF-8 character
+    * @access   private
+    */
+    function utf162utf8($utf16)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+        }
+
+        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+        switch(true) {
+            case ((0x7F & $bytes) == $bytes):
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x7F & $bytes);
+
+            case (0x07FF & $bytes) == $bytes:
+                // return a 2-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xC0 | (($bytes >> 6) & 0x1F))
+                     . chr(0x80 | ($bytes & 0x3F));
+
+            case (0xFFFF & $bytes) == $bytes:
+                // return a 3-byte UTF-8 character
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0xE0 | (($bytes >> 12) & 0x0F))
+                     . chr(0x80 | (($bytes >> 6) & 0x3F))
+                     . chr(0x80 | ($bytes & 0x3F));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * convert a string from one UTF-8 char to one UTF-16 char
+    *
+    * Normally should be handled by mb_convert_encoding, but
+    * provides a slower PHP-only method for installations
+    * that lack the multibye string extension.
+    *
+    * @param    string  $utf8   UTF-8 character
+    * @return   string  UTF-16 character
+    * @access   private
+    */
+    function utf82utf16($utf8)
+    {
+        // oh please oh please oh please oh please oh please
+        if(function_exists('mb_convert_encoding')) {
+            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+        }
+
+        switch(strlen($utf8)) {
+            case 1:
+                // this case should never be reached, because we are in ASCII range
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return $utf8;
+
+            case 2:
+                // return a UTF-16 character from a 2-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr(0x07 & (ord($utf8{0}) >> 2))
+                     . chr((0xC0 & (ord($utf8{0}) << 6))
+                         | (0x3F & ord($utf8{1})));
+
+            case 3:
+                // return a UTF-16 character from a 3-byte UTF-8 char
+                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                return chr((0xF0 & (ord($utf8{0}) << 4))
+                         | (0x0F & (ord($utf8{1}) >> 2)))
+                     . chr((0xC0 & (ord($utf8{1}) << 6))
+                         | (0x7F & ord($utf8{2})));
+        }
+
+        // ignoring UTF-32 for now, sorry
+        return '';
+    }
+
+   /**
+    * encodes an arbitrary variable into JSON format
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   mixed   JSON string representation of input var or an error if a problem occurs
+    * @access   public
+    */
+    function encode($var)
+    {
+        switch (gettype($var)) {
+            case 'boolean':
+                return $var ? 'true' : 'false';
+
+            case 'NULL':
+                return 'null';
+
+            case 'integer':
+                return (int) $var;
+
+            case 'double':
+            case 'float':
+                return (float) $var;
+
+            case 'string':
+                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+                $ascii = '';
+                $strlen_var = strlen($var);
+
+               /*
+                * Iterate over every character in the string,
+                * escaping with a slash or encoding to UTF-8 where necessary
+                */
+                for ($c = 0; $c < $strlen_var; ++$c) {
+
+                    $ord_var_c = ord($var{$c});
+
+                    switch (true) {
+                        case $ord_var_c == 0x08:
+                            $ascii .= '\b';
+                            break;
+                        case $ord_var_c == 0x09:
+                            $ascii .= '\t';
+                            break;
+                        case $ord_var_c == 0x0A:
+                            $ascii .= '\n';
+                            break;
+                        case $ord_var_c == 0x0C:
+                            $ascii .= '\f';
+                            break;
+                        case $ord_var_c == 0x0D:
+                            $ascii .= '\r';
+                            break;
+
+                        case $ord_var_c == 0x22:
+                        case $ord_var_c == 0x2F:
+                        case $ord_var_c == 0x5C:
+                            // double quote, slash, slosh
+                            $ascii .= '\\'.$var{$c};
+                            break;
+
+                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                            // characters U-00000000 - U-0000007F (same as ASCII)
+                            $ascii .= $var{$c};
+                            break;
+
+                        case (($ord_var_c & 0xE0) == 0xC0):
+                            // characters U-00000080 - U-000007FF, mask 110XXXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $c += 1;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF0) == 0xE0):
+                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}));
+                            $c += 2;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF8) == 0xF0):
+                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}));
+                            $c += 3;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFC) == 0xF8):
+                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}));
+                            $c += 4;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFE) == 0xFC):
+                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c + 1}),
+                                         ord($var{$c + 2}),
+                                         ord($var{$c + 3}),
+                                         ord($var{$c + 4}),
+                                         ord($var{$c + 5}));
+                            $c += 5;
+                            $utf16 = $this->utf82utf16($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+                    }
+                }
+
+                return '"'.$ascii.'"';
+
+            case 'array':
+               /*
+                * As per JSON spec if any array key is not an integer
+                * we must treat the the whole array as an object. We
+                * also try to catch a sparsely populated associative
+                * array with numeric keys here because some JS engines
+                * will create an array with empty indexes up to
+                * max_index which can cause memory issues and because
+                * the keys, which may be relevant, will be remapped
+                * otherwise.
+                *
+                * As per the ECMA and JSON specification an object may
+                * have any string as a property. Unfortunately due to
+                * a hole in the ECMA specification if the key is a
+                * ECMA reserved word or starts with a digit the
+                * parameter is only accessible using ECMAScript's
+                * bracket notation.
+                */
+
+                // treat as a JSON object
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                    $properties = array_map(array($this, 'name_value'),
+                                            array_keys($var),
+                                            array_values($var));
+
+                    foreach($properties as $property) {
+                        if(Services_JSON::isError($property)) {
+                            return $property;
+                        }
+                    }
+
+                    return '{' . join(',', $properties) . '}';
+                }
+
+                // treat it like a regular array
+                $elements = array_map(array($this, 'encode'), $var);
+
+                foreach($elements as $element) {
+                    if(Services_JSON::isError($element)) {
+                        return $element;
+                    }
+                }
+
+                return '[' . join(',', $elements) . ']';
+
+            case 'object':
+                $vars = get_object_vars($var);
+
+                $properties = array_map(array($this, 'name_value'),
+                                        array_keys($vars),
+                                        array_values($vars));
+
+                foreach($properties as $property) {
+                    if(Services_JSON::isError($property)) {
+                        return $property;
+                    }
+                }
+
+                return '{' . join(',', $properties) . '}';
+
+            default:
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+                    ? 'null'
+                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
+        }
+    }
+
+   /**
+    * array-walking function for use in generating JSON-formatted name-value pairs
+    *
+    * @param    string  $name   name of key to use
+    * @param    mixed   $value  reference to an array element to be encoded
+    *
+    * @return   string  JSON-formatted name-value pair, like '"name":value'
+    * @access   private
+    */
+    function name_value($name, $value)
+    {
+        $encoded_value = $this->encode($value);
+
+        if(Services_JSON::isError($encoded_value)) {
+            return $encoded_value;
+        }
+
+        return $this->encode(strval($name)) . ':' . $encoded_value;
+    }
+
+   /**
+    * reduce a string by removing leading and trailing comments and whitespace
+    *
+    * @param    $str    string      string value to strip of comments and whitespace
+    *
+    * @return   string  string value stripped of comments and whitespace
+    * @access   private
+    */
+    function reduce_string($str)
+    {
+        $str = preg_replace(array(
+
+                // eliminate single line comments in '// ...' form
+                '#^\s*//(.+)$#m',
+
+                // eliminate multi-line comments in '/* ... */' form, at start of string
+                '#^\s*/\*(.+)\*/#Us',
+
+                // eliminate multi-line comments in '/* ... */' form, at end of string
+                '#/\*(.+)\*/\s*$#Us'
+
+            ), '', $str);
+
+        // eliminate extraneous space
+        return trim($str);
+    }
+
+   /**
+    * decodes a JSON string into appropriate variable
+    *
+    * @param    string  $str    JSON-formatted string
+    *
+    * @return   mixed   number, boolean, string, array, or object
+    *                   corresponding to given JSON input string.
+    *                   See argument 1 to Services_JSON() above for object-output behavior.
+    *                   Note that decode() always returns strings
+    *                   in ASCII or UTF-8 format!
+    * @access   public
+    */
+    function decode($str)
+    {
+        $str = $this->reduce_string($str);
+
+        switch (strtolower($str)) {
+            case 'true':
+                return true;
+
+            case 'false':
+                return false;
+
+            case 'null':
+                return null;
+
+            default:
+                $m = array();
+
+                if (is_numeric($str)) {
+                    // Lookie-loo, it's a number
+
+                    // This would work on its own, but I'm trying to be
+                    // good about returning integers where appropriate:
+                    // return (float)$str;
+
+                    // Return float or int, as appropriate
+                    return ((float)$str == (integer)$str)
+                        ? (integer)$str
+                        : (float)$str;
+
+                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                    // STRINGS RETURNED IN UTF-8 FORMAT
+                    $delim = substr($str, 0, 1);
+                    $chrs = substr($str, 1, -1);
+                    $utf8 = '';
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $ord_chrs_c = ord($chrs{$c});
+
+                        switch (true) {
+                            case $substr_chrs_c_2 == '\b':
+                                $utf8 .= chr(0x08);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\t':
+                                $utf8 .= chr(0x09);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\n':
+                                $utf8 .= chr(0x0A);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\f':
+                                $utf8 .= chr(0x0C);
+                                ++$c;
+                                break;
+                            case $substr_chrs_c_2 == '\r':
+                                $utf8 .= chr(0x0D);
+                                ++$c;
+                                break;
+
+                            case $substr_chrs_c_2 == '\\"':
+                            case $substr_chrs_c_2 == '\\\'':
+                            case $substr_chrs_c_2 == '\\\\':
+                            case $substr_chrs_c_2 == '\\/':
+                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+                                    $utf8 .= $chrs{++$c};
+                                }
+                                break;
+
+                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
+                                // single, escaped unicode character
+                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
+                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
+                                $utf8 .= $this->utf162utf8($utf16);
+                                $c += 5;
+                                break;
+
+                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                                $utf8 .= $chrs{$c};
+                                break;
+
+                            case ($ord_chrs_c & 0xE0) == 0xC0:
+                                // characters U-00000080 - U-000007FF, mask 110XXXXX
+                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 2);
+                                ++$c;
+                                break;
+
+                            case ($ord_chrs_c & 0xF0) == 0xE0:
+                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 3);
+                                $c += 2;
+                                break;
+
+                            case ($ord_chrs_c & 0xF8) == 0xF0:
+                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 4);
+                                $c += 3;
+                                break;
+
+                            case ($ord_chrs_c & 0xFC) == 0xF8:
+                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 5);
+                                $c += 4;
+                                break;
+
+                            case ($ord_chrs_c & 0xFE) == 0xFC:
+                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                $utf8 .= substr($chrs, $c, 6);
+                                $c += 5;
+                                break;
+
+                        }
+
+                    }
+
+                    return $utf8;
+
+                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+                    // array, or object notation
+
+                    if ($str{0} == '[') {
+                        $stk = array(SERVICES_JSON_IN_ARR);
+                        $arr = array();
+                    } else {
+                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = array();
+                        } else {
+                            $stk = array(SERVICES_JSON_IN_OBJ);
+                            $obj = new stdClass();
+                        }
+                    }
+
+                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
+                                           'where' => 0,
+                                           'delim' => false));
+
+                    $chrs = substr($str, 1, -1);
+                    $chrs = $this->reduce_string($chrs);
+
+                    if ($chrs == '') {
+                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                            return $arr;
+
+                        } else {
+                            return $obj;
+
+                        }
+                    }
+
+                    //print("\nparsing {$chrs}\n");
+
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+                        $top = end($stk);
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+
+                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+                            // found a comma that is not inside a string, array, etc.,
+                            // OR we've reached the end of the character list
+                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
+                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                                // we are in an array, so just push an element onto the stack
+                                array_push($arr, $this->decode($slice));
+
+                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                                // we are in an object, so figure
+                                // out the property name and set an
+                                // element in an associative array,
+                                // for now
+                                $parts = array();
+                                
+                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // "name":value pair
+                                    $key = $this->decode($parts[1]);
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // name:value pair, where name is unquoted
+                                    $key = $parts[1];
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                }
+
+                            }
+
+                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+                            // found a quote, and we are not inside a string
+                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+                            //print("Found start of string at {$c}\n");
+
+                        } elseif (($chrs{$c} == $top['delim']) &&
+                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
+                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
+                            // found a quote, we're in a string, and it's not escaped
+                            // we know that it's not escaped becase there is _not_ an
+                            // odd number of backslashes at the end of the string so far
+                            array_pop($stk);
+                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '[') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-bracket, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
+                            //print("Found start of array at {$c}\n");
+
+                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+                            // found a right-bracket, and we're in an array
+                            array_pop($stk);
+                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '{') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a left-brace, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+                            //print("Found start of object at {$c}\n");
+
+                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+                            // found a right-brace, and we're in an object
+                            array_pop($stk);
+                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($substr_chrs_c_2 == '/*') &&
+                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
+                            // found a comment start, and we are in an array, object, or slice
+                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
+                            $c++;
+                            //print("Found start of comment at {$c}\n");
+
+                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
+                            // found a comment end, and we're in one now
+                            array_pop($stk);
+                            $c++;
+
+                            for ($i = $top['where']; $i <= $c; ++$i)
+                                $chrs = substr_replace($chrs, ' ', $i, 1);
+
+                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        }
+
+                    }
+
+                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
+                        return $arr;
+
+                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
+                        return $obj;
+
+                    }
+
+                }
+        }
+    }
+
+    /**
+     * @todo Ultimately, this should just call PEAR::isError()
+     */
+    function isError($data, $code = null)
+    {
+        if (class_exists('pear')) {
+            return PEAR::isError($data, $code);
+        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
+                                 is_subclass_of($data, 'services_json_error'))) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+if (class_exists('PEAR_Error')) {
+
+    class Services_JSON_Error extends PEAR_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+        }
+    }
+
+} else {
+
+    /**
+     * @todo Ultimately, this class shall be descended from PEAR_Error
+     */
+    class Services_JSON_Error
+    {
+        function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null)
+        {
+
+        }
+    }
+
+}
+    
+?>
diff --git a/public/kindeditor/php/demo.php b/public/kindeditor/php/demo.php
new file mode 100644
index 0000000..7ccb2d9
--- /dev/null
+++ b/public/kindeditor/php/demo.php
@@ -0,0 +1,53 @@
+<?php
+	$htmlData = '';
+	if (!empty($_POST['content1'])) {
+		if (get_magic_quotes_gpc()) {
+			$htmlData = stripslashes($_POST['content1']);
+		} else {
+			$htmlData = $_POST['content1'];
+		}
+	}
+?>
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title>KindEditor PHP</title>
+	<link rel="stylesheet" href="../themes/default/default.css" />
+	<link rel="stylesheet" href="../plugins/code/prettify.css" />
+	<script charset="utf-8" src="../kindeditor.js"></script>
+	<script charset="utf-8" src="../lang/zh-CN.js"></script>
+	<script charset="utf-8" src="../plugins/code/prettify.js"></script>
+	<script>
+		KindEditor.ready(function(K) {
+			var editor1 = K.create('textarea[name="content1"]', {
+				cssPath : '../plugins/code/prettify.css',
+				uploadJson : '../php/upload_json.php',
+				fileManagerJson : '../php/file_manager_json.php',
+				allowFileManager : true,
+				afterCreate : function() {
+					var self = this;
+					K.ctrl(document, 13, function() {
+						self.sync();
+						K('form[name=example]')[0].submit();
+					});
+					K.ctrl(self.edit.doc, 13, function() {
+						self.sync();
+						K('form[name=example]')[0].submit();
+					});
+				}
+			});
+			prettyPrint();
+		});
+	</script>
+</head>
+<body>
+	<?php echo $htmlData; ?>
+	<form name="example" method="post" action="demo.php">
+		<textarea name="content1" style="width:700px;height:200px;visibility:hidden;"><?php echo htmlspecialchars($htmlData); ?></textarea>
+		<br />
+		<input type="submit" name="button" value="提交内容" /> (提交快捷键: Ctrl + Enter)
+	</form>
+</body>
+</html>
+
diff --git a/public/kindeditor/php/file_manager_json.php b/public/kindeditor/php/file_manager_json.php
new file mode 100644
index 0000000..2c6c1f3
--- /dev/null
+++ b/public/kindeditor/php/file_manager_json.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * KindEditor PHP
+ *
+ * 本PHP程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ *
+ */
+
+require_once 'JSON.php';
+
+$php_path = dirname(__FILE__) . '/';
+$php_url = dirname($_SERVER['PHP_SELF']) . '/';
+
+//根目录路径，可以指定绝对路径，比如 /var/www/attached/
+$root_path = $php_path . '../attached/';
+//根目录URL，可以指定绝对路径，比如 http://www.yoursite.com/attached/
+$root_url = $php_url . '../attached/';
+//图片扩展名
+$ext_arr = array('gif', 'jpg', 'jpeg', 'png', 'bmp');
+
+//目录名
+$dir_name = empty($_GET['dir']) ? '' : trim($_GET['dir']);
+if (!in_array($dir_name, array('', 'image', 'flash', 'media', 'file'))) {
+	echo "Invalid Directory name.";
+	exit;
+}
+if ($dir_name !== '') {
+	$root_path .= $dir_name . "/";
+	$root_url .= $dir_name . "/";
+	if (!file_exists($root_path)) {
+		mkdir($root_path);
+	}
+}
+
+//根据path参数，设置各路径和URL
+if (empty($_GET['path'])) {
+	$current_path = realpath($root_path) . '/';
+	$current_url = $root_url;
+	$current_dir_path = '';
+	$moveup_dir_path = '';
+} else {
+	$current_path = realpath($root_path) . '/' . $_GET['path'];
+	$current_url = $root_url . $_GET['path'];
+	$current_dir_path = $_GET['path'];
+	$moveup_dir_path = preg_replace('/(.*?)[^\/]+\/$/', '$1', $current_dir_path);
+}
+//echo realpath($root_path);
+//排序形式，name or size or type
+$order = empty($_GET['order']) ? 'name' : strtolower($_GET['order']);
+
+//不允许使用..移动到上一级目录
+if (preg_match('/\.\./', $current_path)) {
+	echo 'Access is not allowed.';
+	exit;
+}
+//最后一个字符不是/
+if (!preg_match('/\/$/', $current_path)) {
+	echo 'Parameter is not valid.';
+	exit;
+}
+//目录不存在或不是目录
+if (!file_exists($current_path) || !is_dir($current_path)) {
+	echo 'Directory does not exist.';
+	exit;
+}
+
+//遍历目录取得文件信息
+$file_list = array();
+if ($handle = opendir($current_path)) {
+	$i = 0;
+	while (false !== ($filename = readdir($handle))) {
+		if ($filename{0} == '.') continue;
+		$file = $current_path . $filename;
+		if (is_dir($file)) {
+			$file_list[$i]['is_dir'] = true; //是否文件夹
+			$file_list[$i]['has_file'] = (count(scandir($file)) > 2); //文件夹是否包含文件
+			$file_list[$i]['filesize'] = 0; //文件大小
+			$file_list[$i]['is_photo'] = false; //是否图片
+			$file_list[$i]['filetype'] = ''; //文件类别，用扩展名判断
+		} else {
+			$file_list[$i]['is_dir'] = false;
+			$file_list[$i]['has_file'] = false;
+			$file_list[$i]['filesize'] = filesize($file);
+			$file_list[$i]['dir_path'] = '';
+			$file_ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
+			$file_list[$i]['is_photo'] = in_array($file_ext, $ext_arr);
+			$file_list[$i]['filetype'] = $file_ext;
+		}
+		$file_list[$i]['filename'] = $filename; //文件名，包含扩展名
+		$file_list[$i]['datetime'] = date('Y-m-d H:i:s', filemtime($file)); //文件最后修改时间
+		$i++;
+	}
+	closedir($handle);
+}
+
+//排序
+function cmp_func($a, $b) {
+	global $order;
+	if ($a['is_dir'] && !$b['is_dir']) {
+		return -1;
+	} else if (!$a['is_dir'] && $b['is_dir']) {
+		return 1;
+	} else {
+		if ($order == 'size') {
+			if ($a['filesize'] > $b['filesize']) {
+				return 1;
+			} else if ($a['filesize'] < $b['filesize']) {
+				return -1;
+			} else {
+				return 0;
+			}
+		} else if ($order == 'type') {
+			return strcmp($a['filetype'], $b['filetype']);
+		} else {
+			return strcmp($a['filename'], $b['filename']);
+		}
+	}
+}
+usort($file_list, 'cmp_func');
+
+$result = array();
+//相对于根目录的上一级目录
+$result['moveup_dir_path'] = $moveup_dir_path;
+//相对于根目录的当前目录
+$result['current_dir_path'] = $current_dir_path;
+//当前目录的URL
+$result['current_url'] = $current_url;
+//文件数
+$result['total_count'] = count($file_list);
+//文件列表数组
+$result['file_list'] = $file_list;
+
+//输出JSON字符串
+header('Content-type: application/json; charset=UTF-8');
+$json = new Services_JSON();
+echo $json->encode($result);
diff --git a/public/kindeditor/php/upload_json.php b/public/kindeditor/php/upload_json.php
new file mode 100644
index 0000000..9fa5631
--- /dev/null
+++ b/public/kindeditor/php/upload_json.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * KindEditor PHP
+ *
+ * 本PHP程序是演示程序，建议不要直接在实际项目中使用。
+ * 如果您确定直接使用本程序，使用之前请仔细确认相关安全设置。
+ *
+ */
+
+require_once 'JSON.php';
+
+$php_path = dirname(__FILE__) . '/';
+$php_url = dirname($_SERVER['PHP_SELF']) . '/';
+
+//文件保存目录路径
+$save_path = $php_path . '../attached/';
+//文件保存目录URL
+$save_url = $php_url . '../attached/';
+//定义允许上传的文件扩展名
+$ext_arr = array(
+	'image' => array('gif', 'jpg', 'jpeg', 'png', 'bmp'),
+	'flash' => array('swf', 'flv'),
+	'media' => array('swf', 'flv', 'mp3', 'wav', 'wma', 'wmv', 'mid', 'avi', 'mpg', 'asf', 'rm', 'rmvb'),
+	'file' => array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'htm', 'html', 'txt', 'zip', 'rar', 'gz', 'bz2'),
+);
+//最大文件大小
+$max_size = 1000000;
+
+$save_path = realpath($save_path) . '/';
+
+//PHP上传失败
+if (!empty($_FILES['imgFile']['error'])) {
+	switch($_FILES['imgFile']['error']){
+		case '1':
+			$error = '超过php.ini允许的大小。';
+			break;
+		case '2':
+			$error = '超过表单允许的大小。';
+			break;
+		case '3':
+			$error = '图片只有部分被上传。';
+			break;
+		case '4':
+			$error = '请选择图片。';
+			break;
+		case '6':
+			$error = '找不到临时目录。';
+			break;
+		case '7':
+			$error = '写文件到硬盘出错。';
+			break;
+		case '8':
+			$error = 'File upload stopped by extension。';
+			break;
+		case '999':
+		default:
+			$error = '未知错误。';
+	}
+	alert($error);
+}
+
+//有上传文件时
+if (empty($_FILES) === false) {
+	//原文件名
+	$file_name = $_FILES['imgFile']['name'];
+	//服务器上临时文件名
+	$tmp_name = $_FILES['imgFile']['tmp_name'];
+	//文件大小
+	$file_size = $_FILES['imgFile']['size'];
+	//检查文件名
+	if (!$file_name) {
+		alert("请选择文件。");
+	}
+	//检查目录
+	if (@is_dir($save_path) === false) {
+		alert("上传目录不存在。");
+	}
+	//检查目录写权限
+	if (@is_writable($save_path) === false) {
+		alert("上传目录没有写权限。");
+	}
+	//检查是否已上传
+	if (@is_uploaded_file($tmp_name) === false) {
+		alert("上传失败。");
+	}
+	//检查文件大小
+	if ($file_size > $max_size) {
+		alert("上传文件大小超过限制。");
+	}
+	//检查目录名
+	$dir_name = empty($_GET['dir']) ? 'image' : trim($_GET['dir']);
+	if (empty($ext_arr[$dir_name])) {
+		alert("目录名不正确。");
+	}
+	//获得文件扩展名
+	$temp_arr = explode(".", $file_name);
+	$file_ext = array_pop($temp_arr);
+	$file_ext = trim($file_ext);
+	$file_ext = strtolower($file_ext);
+	//检查扩展名
+	if (in_array($file_ext, $ext_arr[$dir_name]) === false) {
+		alert("上传文件扩展名是不允许的扩展名。\n只允许" . implode(",", $ext_arr[$dir_name]) . "格式。");
+	}
+	//创建文件夹
+	if ($dir_name !== '') {
+		$save_path .= $dir_name . "/";
+		$save_url .= $dir_name . "/";
+		if (!file_exists($save_path)) {
+			mkdir($save_path);
+		}
+	}
+	$ymd = date("Ymd");
+	$save_path .= $ymd . "/";
+	$save_url .= $ymd . "/";
+	if (!file_exists($save_path)) {
+		mkdir($save_path);
+	}
+	//新文件名
+	$new_file_name = date("YmdHis") . '_' . rand(10000, 99999) . '.' . $file_ext;
+	//移动文件
+	$file_path = $save_path . $new_file_name;
+	if (move_uploaded_file($tmp_name, $file_path) === false) {
+		alert("上传文件失败。");
+	}
+	@chmod($file_path, 0644);
+	$file_url = $save_url . $new_file_name;
+
+	header('Content-type: text/html; charset=UTF-8');
+	$json = new Services_JSON();
+	echo $json->encode(array('error' => 0, 'url' => $file_url));
+	exit;
+}
+
+function alert($msg) {
+	header('Content-type: text/html; charset=UTF-8');
+	$json = new Services_JSON();
+	echo $json->encode(array('error' => 1, 'message' => $msg));
+	exit;
+}
diff --git a/public/kindeditor/plugins/anchor/anchor.js b/public/kindeditor/plugins/anchor/anchor.js
new file mode 100644
index 0000000..55ab894
--- /dev/null
+++ b/public/kindeditor/plugins/anchor/anchor.js
@@ -0,0 +1,46 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
diff --git a/public/kindeditor/plugins/autoheight/autoheight.js b/public/kindeditor/plugins/autoheight/autoheight.js
new file mode 100644
index 0000000..546578b
--- /dev/null
+++ b/public/kindeditor/plugins/autoheight/autoheight.js
@@ -0,0 +1,54 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
diff --git a/public/kindeditor/plugins/baidumap/baidumap.js b/public/kindeditor/plugins/baidumap/baidumap.js
new file mode 100644
index 0000000..12751c4
--- /dev/null
+++ b/public/kindeditor/plugins/baidumap/baidumap.js
@@ -0,0 +1,93 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/public/kindeditor/plugins/baidumap/index.html b/public/kindeditor/plugins/baidumap/index.html
new file mode 100644
index 0000000..e106d1a
--- /dev/null
+++ b/public/kindeditor/plugins/baidumap/index.html
@@ -0,0 +1,83 @@
+<!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>
+<meta charset="utf-8" />
+<meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具" />
+<meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图" />
+<title>百度地图API自定义地图</title>
+<!--引用百度地图API-->
+<style type="text/css">
+	html,body{margin:0;padding:0;}
+	.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+	.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+</head>
+
+<body onload="initMap();">
+  <!--百度地图容器-->
+  <div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+	function getParam(name) {
+		return location.href.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+	}
+	var centerParam = getParam('center');
+	var zoomParam = getParam('zoom');
+	var widthParam = getParam('width');
+	var heightParam = getParam('height');
+	var markersParam = getParam('markers');
+	var markerStylesParam = getParam('markerStyles');
+
+	//创建和初始化地图函数：
+	function initMap(){
+		// [FF]切换模式后报错
+		if (!window.BMap) {
+			return;
+		}
+		var dituContent = document.getElementById('dituContent');
+		dituContent.style.width = widthParam + 'px';
+		dituContent.style.height = heightParam + 'px';
+
+		createMap();//创建地图
+		setMapEvent();//设置地图事件
+		addMapControl();//向地图添加控件
+
+		// 创建标注
+		var markersArr = markersParam.split(',');
+		var point = new BMap.Point(markersArr[0], markersArr[1]);
+		var marker = new BMap.Marker(point);
+		map.addOverlay(marker); // 将标注添加到地图中
+	}
+
+	//创建地图函数：
+	function createMap(){
+		var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+		var centerArr = centerParam.split(',');
+		var point = new BMap.Point(centerArr[0], centerArr[1]);//定义一个中心点坐标
+		map.centerAndZoom(point, zoomParam);//设定地图的中心点和坐标并将地图显示在地图容器中
+		window.map = map;//将map变量存储在全局
+	}
+
+	//地图事件设置函数：
+	function setMapEvent(){
+		map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+		map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+		map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+		map.enableKeyboard();//启用键盘上下左右键移动地图
+	}
+
+	//地图控件添加函数：
+	function addMapControl(){
+		//向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
+	map.addControl(ctrl_nav);
+		//向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
+	map.addControl(ctrl_ove);
+		//向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/public/kindeditor/plugins/baidumap/map.html b/public/kindeditor/plugins/baidumap/map.html
new file mode 100644
index 0000000..b65ea1d
--- /dev/null
+++ b/public/kindeditor/plugins/baidumap/map.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Baidu Maps</title>
+		<style>
+			html { height: 100% }
+			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		</style>
+		<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
+		<script>
+			var map, geocoder;
+			function initialize() {
+				map = new BMap.Map('map_canvas');
+				var point = new BMap.Point(121.473704, 31.230393);
+				map.centerAndZoom(point, 11);
+				map.addControl(new BMap.NavigationControl());
+				map.enableScrollWheelZoom();
+
+				var gc = new BMap.Geocoder();
+				gc.getLocation(point, function(rs){
+					var addComp = rs.addressComponents;
+					var address = [addComp.city].join('');
+					parent.document.getElementById("kindeditor_plugin_map_address").value = address;
+				});
+			}
+			function search(address) {
+				if (!map) return;
+				var local = new BMap.LocalSearch(map, {
+					renderOptions: {
+						map: map,
+						autoViewport: true,
+						selectFirstResult: false
+					}
+				});
+				local.search(address);
+			}
+		</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
diff --git a/public/kindeditor/plugins/clearhtml/clearhtml.js b/public/kindeditor/plugins/clearhtml/clearhtml.js
new file mode 100644
index 0000000..1bf0e5d
--- /dev/null
+++ b/public/kindeditor/plugins/clearhtml/clearhtml.js
@@ -0,0 +1,29 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
diff --git a/public/kindeditor/plugins/code/code.js b/public/kindeditor/plugins/code/code.js
new file mode 100644
index 0000000..85e4225
--- /dev/null
+++ b/public/kindeditor/plugins/code/code.js
@@ -0,0 +1,62 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/public/kindeditor/plugins/code/prettify.css b/public/kindeditor/plugins/code/prettify.css
new file mode 100644
index 0000000..b8287e5
--- /dev/null
+++ b/public/kindeditor/plugins/code/prettify.css
@@ -0,0 +1,13 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
+
+pre.prettyprint {
+	border: 0;
+	border-left: 3px solid rgb(204, 204, 204);
+	margin-left: 2em;
+	padding: 0.5em;
+	font-size: 110%;
+	display: block;
+	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	margin: 1em 0px;
+	white-space: pre;
+}
diff --git a/public/kindeditor/plugins/code/prettify.js b/public/kindeditor/plugins/code/prettify.js
new file mode 100644
index 0000000..eef5ad7
--- /dev/null
+++ b/public/kindeditor/plugins/code/prettify.js
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"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"],
+J=[v,"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"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,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"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["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"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["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"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"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",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"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,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/public/kindeditor/plugins/emoticons/emoticons.js b/public/kindeditor/plugins/emoticons/emoticons.js
new file mode 100644
index 0000000..a990066
--- /dev/null
+++ b/public/kindeditor/plugins/emoticons/emoticons.js
@@ -0,0 +1,129 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
diff --git a/public/kindeditor/plugins/emoticons/images/0.gif b/public/kindeditor/plugins/emoticons/images/0.gif
new file mode 100644
index 0000000..5be27cb
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/0.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/1.gif b/public/kindeditor/plugins/emoticons/images/1.gif
new file mode 100644
index 0000000..a2644a9
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/1.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/10.gif b/public/kindeditor/plugins/emoticons/images/10.gif
new file mode 100644
index 0000000..905c15b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/10.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/100.gif b/public/kindeditor/plugins/emoticons/images/100.gif
new file mode 100644
index 0000000..92ad35d
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/100.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/101.gif b/public/kindeditor/plugins/emoticons/images/101.gif
new file mode 100644
index 0000000..1f27663
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/101.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/102.gif b/public/kindeditor/plugins/emoticons/images/102.gif
new file mode 100644
index 0000000..748ded1
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/102.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/103.gif b/public/kindeditor/plugins/emoticons/images/103.gif
new file mode 100644
index 0000000..be9eaa0
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/103.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/104.gif b/public/kindeditor/plugins/emoticons/images/104.gif
new file mode 100644
index 0000000..d7c2066
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/104.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/105.gif b/public/kindeditor/plugins/emoticons/images/105.gif
new file mode 100644
index 0000000..2f353ca
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/105.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/106.gif b/public/kindeditor/plugins/emoticons/images/106.gif
new file mode 100644
index 0000000..5193534
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/106.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/107.gif b/public/kindeditor/plugins/emoticons/images/107.gif
new file mode 100644
index 0000000..70d38d3
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/107.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/108.gif b/public/kindeditor/plugins/emoticons/images/108.gif
new file mode 100644
index 0000000..749d500
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/108.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/109.gif b/public/kindeditor/plugins/emoticons/images/109.gif
new file mode 100644
index 0000000..6f57d56
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/109.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/11.gif b/public/kindeditor/plugins/emoticons/images/11.gif
new file mode 100644
index 0000000..b512dd5
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/11.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/110.gif b/public/kindeditor/plugins/emoticons/images/110.gif
new file mode 100644
index 0000000..e253abc
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/110.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/111.gif b/public/kindeditor/plugins/emoticons/images/111.gif
new file mode 100644
index 0000000..0c56723
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/111.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/112.gif b/public/kindeditor/plugins/emoticons/images/112.gif
new file mode 100644
index 0000000..c8ddce8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/112.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/113.gif b/public/kindeditor/plugins/emoticons/images/113.gif
new file mode 100644
index 0000000..2727104
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/113.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/114.gif b/public/kindeditor/plugins/emoticons/images/114.gif
new file mode 100644
index 0000000..53918e2
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/114.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/115.gif b/public/kindeditor/plugins/emoticons/images/115.gif
new file mode 100644
index 0000000..4db3369
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/115.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/116.gif b/public/kindeditor/plugins/emoticons/images/116.gif
new file mode 100644
index 0000000..57326bd
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/116.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/117.gif b/public/kindeditor/plugins/emoticons/images/117.gif
new file mode 100644
index 0000000..14611b6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/117.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/118.gif b/public/kindeditor/plugins/emoticons/images/118.gif
new file mode 100644
index 0000000..8c25500
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/118.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/119.gif b/public/kindeditor/plugins/emoticons/images/119.gif
new file mode 100644
index 0000000..65bb468
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/119.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/12.gif b/public/kindeditor/plugins/emoticons/images/12.gif
new file mode 100644
index 0000000..547529c
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/12.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/120.gif b/public/kindeditor/plugins/emoticons/images/120.gif
new file mode 100644
index 0000000..5ce77c0
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/120.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/121.gif b/public/kindeditor/plugins/emoticons/images/121.gif
new file mode 100644
index 0000000..a021aba
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/121.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/122.gif b/public/kindeditor/plugins/emoticons/images/122.gif
new file mode 100644
index 0000000..9a79e11
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/122.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/123.gif b/public/kindeditor/plugins/emoticons/images/123.gif
new file mode 100644
index 0000000..b9480be
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/123.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/124.gif b/public/kindeditor/plugins/emoticons/images/124.gif
new file mode 100644
index 0000000..7fed477
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/124.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/125.gif b/public/kindeditor/plugins/emoticons/images/125.gif
new file mode 100644
index 0000000..e2c3c11
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/125.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/126.gif b/public/kindeditor/plugins/emoticons/images/126.gif
new file mode 100644
index 0000000..24105c9
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/126.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/127.gif b/public/kindeditor/plugins/emoticons/images/127.gif
new file mode 100644
index 0000000..0cead36
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/127.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/128.gif b/public/kindeditor/plugins/emoticons/images/128.gif
new file mode 100644
index 0000000..3185861
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/128.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/129.gif b/public/kindeditor/plugins/emoticons/images/129.gif
new file mode 100644
index 0000000..ffd7c6b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/129.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/13.gif b/public/kindeditor/plugins/emoticons/images/13.gif
new file mode 100644
index 0000000..3475300
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/13.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/130.gif b/public/kindeditor/plugins/emoticons/images/130.gif
new file mode 100644
index 0000000..d828e3d
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/130.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/131.gif b/public/kindeditor/plugins/emoticons/images/131.gif
new file mode 100644
index 0000000..dcb096f
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/131.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/132.gif b/public/kindeditor/plugins/emoticons/images/132.gif
new file mode 100644
index 0000000..1b272a6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/132.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/133.gif b/public/kindeditor/plugins/emoticons/images/133.gif
new file mode 100644
index 0000000..0d0e864
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/133.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/134.gif b/public/kindeditor/plugins/emoticons/images/134.gif
new file mode 100644
index 0000000..cf48356
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/134.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/14.gif b/public/kindeditor/plugins/emoticons/images/14.gif
new file mode 100644
index 0000000..6a788f8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/14.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/15.gif b/public/kindeditor/plugins/emoticons/images/15.gif
new file mode 100644
index 0000000..debab8e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/15.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/16.gif b/public/kindeditor/plugins/emoticons/images/16.gif
new file mode 100644
index 0000000..ed5d29f
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/16.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/17.gif b/public/kindeditor/plugins/emoticons/images/17.gif
new file mode 100644
index 0000000..85886fe
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/17.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/18.gif b/public/kindeditor/plugins/emoticons/images/18.gif
new file mode 100644
index 0000000..b6af218
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/18.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/19.gif b/public/kindeditor/plugins/emoticons/images/19.gif
new file mode 100644
index 0000000..e045ff2
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/19.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/2.gif b/public/kindeditor/plugins/emoticons/images/2.gif
new file mode 100644
index 0000000..40cfda4
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/2.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/20.gif b/public/kindeditor/plugins/emoticons/images/20.gif
new file mode 100644
index 0000000..efd650f
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/20.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/21.gif b/public/kindeditor/plugins/emoticons/images/21.gif
new file mode 100644
index 0000000..cb8cf6d
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/21.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/22.gif b/public/kindeditor/plugins/emoticons/images/22.gif
new file mode 100644
index 0000000..96b04df
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/22.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/23.gif b/public/kindeditor/plugins/emoticons/images/23.gif
new file mode 100644
index 0000000..96516b8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/23.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/24.gif b/public/kindeditor/plugins/emoticons/images/24.gif
new file mode 100644
index 0000000..5f925c7
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/24.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/25.gif b/public/kindeditor/plugins/emoticons/images/25.gif
new file mode 100644
index 0000000..97f8b1a
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/25.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/26.gif b/public/kindeditor/plugins/emoticons/images/26.gif
new file mode 100644
index 0000000..a7cded7
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/26.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/27.gif b/public/kindeditor/plugins/emoticons/images/27.gif
new file mode 100644
index 0000000..bb46890
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/27.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/28.gif b/public/kindeditor/plugins/emoticons/images/28.gif
new file mode 100644
index 0000000..f59dd58
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/28.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/29.gif b/public/kindeditor/plugins/emoticons/images/29.gif
new file mode 100644
index 0000000..3c5227e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/29.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/3.gif b/public/kindeditor/plugins/emoticons/images/3.gif
new file mode 100644
index 0000000..6d6f762
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/3.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/30.gif b/public/kindeditor/plugins/emoticons/images/30.gif
new file mode 100644
index 0000000..e24a180
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/30.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/31.gif b/public/kindeditor/plugins/emoticons/images/31.gif
new file mode 100644
index 0000000..073e743
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/31.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/32.gif b/public/kindeditor/plugins/emoticons/images/32.gif
new file mode 100644
index 0000000..772eff2
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/32.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/33.gif b/public/kindeditor/plugins/emoticons/images/33.gif
new file mode 100644
index 0000000..217c1c5
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/33.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/34.gif b/public/kindeditor/plugins/emoticons/images/34.gif
new file mode 100644
index 0000000..e9d4213
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/34.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/35.gif b/public/kindeditor/plugins/emoticons/images/35.gif
new file mode 100644
index 0000000..d6da2c3
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/35.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/36.gif b/public/kindeditor/plugins/emoticons/images/36.gif
new file mode 100644
index 0000000..c1e6ac9
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/36.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/37.gif b/public/kindeditor/plugins/emoticons/images/37.gif
new file mode 100644
index 0000000..92efec6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/37.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/38.gif b/public/kindeditor/plugins/emoticons/images/38.gif
new file mode 100644
index 0000000..489f0f9
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/38.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/39.gif b/public/kindeditor/plugins/emoticons/images/39.gif
new file mode 100644
index 0000000..734f6d8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/39.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/4.gif b/public/kindeditor/plugins/emoticons/images/4.gif
new file mode 100644
index 0000000..6ccdaa2
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/4.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/40.gif b/public/kindeditor/plugins/emoticons/images/40.gif
new file mode 100644
index 0000000..24a8eb6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/40.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/41.gif b/public/kindeditor/plugins/emoticons/images/41.gif
new file mode 100644
index 0000000..99139e1
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/41.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/42.gif b/public/kindeditor/plugins/emoticons/images/42.gif
new file mode 100644
index 0000000..f60897e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/42.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/43.gif b/public/kindeditor/plugins/emoticons/images/43.gif
new file mode 100644
index 0000000..4350491
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/43.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/44.gif b/public/kindeditor/plugins/emoticons/images/44.gif
new file mode 100644
index 0000000..650d3dd
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/44.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/45.gif b/public/kindeditor/plugins/emoticons/images/45.gif
new file mode 100644
index 0000000..5c8e071
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/45.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/46.gif b/public/kindeditor/plugins/emoticons/images/46.gif
new file mode 100644
index 0000000..f3cb074
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/46.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/47.gif b/public/kindeditor/plugins/emoticons/images/47.gif
new file mode 100644
index 0000000..5b3057a
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/47.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/48.gif b/public/kindeditor/plugins/emoticons/images/48.gif
new file mode 100644
index 0000000..27a30c1
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/48.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/49.gif b/public/kindeditor/plugins/emoticons/images/49.gif
new file mode 100644
index 0000000..dcfa48a
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/49.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/5.gif b/public/kindeditor/plugins/emoticons/images/5.gif
new file mode 100644
index 0000000..ab0b81b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/5.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/50.gif b/public/kindeditor/plugins/emoticons/images/50.gif
new file mode 100644
index 0000000..029cf0f
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/50.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/51.gif b/public/kindeditor/plugins/emoticons/images/51.gif
new file mode 100644
index 0000000..69f183f
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/51.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/52.gif b/public/kindeditor/plugins/emoticons/images/52.gif
new file mode 100644
index 0000000..d41e8aa
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/52.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/53.gif b/public/kindeditor/plugins/emoticons/images/53.gif
new file mode 100644
index 0000000..56352dd
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/53.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/54.gif b/public/kindeditor/plugins/emoticons/images/54.gif
new file mode 100644
index 0000000..b28d848
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/54.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/55.gif b/public/kindeditor/plugins/emoticons/images/55.gif
new file mode 100644
index 0000000..e18da84
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/55.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/56.gif b/public/kindeditor/plugins/emoticons/images/56.gif
new file mode 100644
index 0000000..edf96f0
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/56.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/57.gif b/public/kindeditor/plugins/emoticons/images/57.gif
new file mode 100644
index 0000000..3f0e2b9
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/57.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/58.gif b/public/kindeditor/plugins/emoticons/images/58.gif
new file mode 100644
index 0000000..47b1aaa
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/58.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/59.gif b/public/kindeditor/plugins/emoticons/images/59.gif
new file mode 100644
index 0000000..918288b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/59.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/6.gif b/public/kindeditor/plugins/emoticons/images/6.gif
new file mode 100644
index 0000000..ceab122
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/6.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/60.gif b/public/kindeditor/plugins/emoticons/images/60.gif
new file mode 100644
index 0000000..66d2113
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/60.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/61.gif b/public/kindeditor/plugins/emoticons/images/61.gif
new file mode 100644
index 0000000..034933e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/61.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/62.gif b/public/kindeditor/plugins/emoticons/images/62.gif
new file mode 100644
index 0000000..8d5c4fd
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/62.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/63.gif b/public/kindeditor/plugins/emoticons/images/63.gif
new file mode 100644
index 0000000..d58fcf6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/63.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/64.gif b/public/kindeditor/plugins/emoticons/images/64.gif
new file mode 100644
index 0000000..c4e00bd
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/64.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/65.gif b/public/kindeditor/plugins/emoticons/images/65.gif
new file mode 100644
index 0000000..da23bfa
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/65.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/66.gif b/public/kindeditor/plugins/emoticons/images/66.gif
new file mode 100644
index 0000000..310ec65
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/66.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/67.gif b/public/kindeditor/plugins/emoticons/images/67.gif
new file mode 100644
index 0000000..51761ba
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/67.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/68.gif b/public/kindeditor/plugins/emoticons/images/68.gif
new file mode 100644
index 0000000..345cb43
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/68.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/69.gif b/public/kindeditor/plugins/emoticons/images/69.gif
new file mode 100644
index 0000000..e0f28a0
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/69.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/7.gif b/public/kindeditor/plugins/emoticons/images/7.gif
new file mode 100644
index 0000000..2f45399
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/7.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/70.gif b/public/kindeditor/plugins/emoticons/images/70.gif
new file mode 100644
index 0000000..24284cf
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/70.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/71.gif b/public/kindeditor/plugins/emoticons/images/71.gif
new file mode 100644
index 0000000..a0ccf2e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/71.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/72.gif b/public/kindeditor/plugins/emoticons/images/72.gif
new file mode 100644
index 0000000..7e113ee
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/72.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/73.gif b/public/kindeditor/plugins/emoticons/images/73.gif
new file mode 100644
index 0000000..c0293c3
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/73.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/74.gif b/public/kindeditor/plugins/emoticons/images/74.gif
new file mode 100644
index 0000000..1c52bde
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/74.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/75.gif b/public/kindeditor/plugins/emoticons/images/75.gif
new file mode 100644
index 0000000..9cb9aa7
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/75.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/76.gif b/public/kindeditor/plugins/emoticons/images/76.gif
new file mode 100644
index 0000000..27019f8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/76.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/77.gif b/public/kindeditor/plugins/emoticons/images/77.gif
new file mode 100644
index 0000000..8f882f5
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/77.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/78.gif b/public/kindeditor/plugins/emoticons/images/78.gif
new file mode 100644
index 0000000..d0d0856
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/78.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/79.gif b/public/kindeditor/plugins/emoticons/images/79.gif
new file mode 100644
index 0000000..61652a7
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/79.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/8.gif b/public/kindeditor/plugins/emoticons/images/8.gif
new file mode 100644
index 0000000..f6c8834
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/8.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/80.gif b/public/kindeditor/plugins/emoticons/images/80.gif
new file mode 100644
index 0000000..9a77936
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/80.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/81.gif b/public/kindeditor/plugins/emoticons/images/81.gif
new file mode 100644
index 0000000..2329101
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/81.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/82.gif b/public/kindeditor/plugins/emoticons/images/82.gif
new file mode 100644
index 0000000..644748a
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/82.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/83.gif b/public/kindeditor/plugins/emoticons/images/83.gif
new file mode 100644
index 0000000..fbf275b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/83.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/84.gif b/public/kindeditor/plugins/emoticons/images/84.gif
new file mode 100644
index 0000000..076f0c6
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/84.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/85.gif b/public/kindeditor/plugins/emoticons/images/85.gif
new file mode 100644
index 0000000..d254af4
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/85.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/86.gif b/public/kindeditor/plugins/emoticons/images/86.gif
new file mode 100644
index 0000000..8f09d33
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/86.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/87.gif b/public/kindeditor/plugins/emoticons/images/87.gif
new file mode 100644
index 0000000..df70756
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/87.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/88.gif b/public/kindeditor/plugins/emoticons/images/88.gif
new file mode 100644
index 0000000..4d8b15e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/88.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/89.gif b/public/kindeditor/plugins/emoticons/images/89.gif
new file mode 100644
index 0000000..05726dc
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/89.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/9.gif b/public/kindeditor/plugins/emoticons/images/9.gif
new file mode 100644
index 0000000..c2d8450
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/9.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/90.gif b/public/kindeditor/plugins/emoticons/images/90.gif
new file mode 100644
index 0000000..adaf20e
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/90.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/91.gif b/public/kindeditor/plugins/emoticons/images/91.gif
new file mode 100644
index 0000000..608d0ad
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/91.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/92.gif b/public/kindeditor/plugins/emoticons/images/92.gif
new file mode 100644
index 0000000..b909e16
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/92.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/93.gif b/public/kindeditor/plugins/emoticons/images/93.gif
new file mode 100644
index 0000000..7f71a8c
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/93.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/94.gif b/public/kindeditor/plugins/emoticons/images/94.gif
new file mode 100644
index 0000000..4f26d7d
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/94.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/95.gif b/public/kindeditor/plugins/emoticons/images/95.gif
new file mode 100644
index 0000000..5ef6d38
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/95.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/96.gif b/public/kindeditor/plugins/emoticons/images/96.gif
new file mode 100644
index 0000000..2b709e1
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/96.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/97.gif b/public/kindeditor/plugins/emoticons/images/97.gif
new file mode 100644
index 0000000..cf29be8
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/97.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/98.gif b/public/kindeditor/plugins/emoticons/images/98.gif
new file mode 100644
index 0000000..c70e7d3
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/98.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/99.gif b/public/kindeditor/plugins/emoticons/images/99.gif
new file mode 100644
index 0000000..05c1863
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/99.gif differ
diff --git a/public/kindeditor/plugins/emoticons/images/static.gif b/public/kindeditor/plugins/emoticons/images/static.gif
new file mode 100644
index 0000000..b8c444b
Binary files /dev/null and b/public/kindeditor/plugins/emoticons/images/static.gif differ
diff --git a/public/kindeditor/plugins/filemanager/filemanager.js b/public/kindeditor/plugins/filemanager/filemanager.js
new file mode 100644
index 0000000..fd899af
--- /dev/null
+++ b/public/kindeditor/plugins/filemanager/filemanager.js
@@ -0,0 +1,189 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
diff --git a/public/kindeditor/plugins/filemanager/images/file-16.gif b/public/kindeditor/plugins/filemanager/images/file-16.gif
new file mode 100644
index 0000000..2cf6e47
Binary files /dev/null and b/public/kindeditor/plugins/filemanager/images/file-16.gif differ
diff --git a/public/kindeditor/plugins/filemanager/images/file-64.gif b/public/kindeditor/plugins/filemanager/images/file-64.gif
new file mode 100644
index 0000000..2e211da
Binary files /dev/null and b/public/kindeditor/plugins/filemanager/images/file-64.gif differ
diff --git a/public/kindeditor/plugins/filemanager/images/folder-16.gif b/public/kindeditor/plugins/filemanager/images/folder-16.gif
new file mode 100644
index 0000000..850b5a3
Binary files /dev/null and b/public/kindeditor/plugins/filemanager/images/folder-16.gif differ
diff --git a/public/kindeditor/plugins/filemanager/images/folder-64.gif b/public/kindeditor/plugins/filemanager/images/folder-64.gif
new file mode 100644
index 0000000..e8a1b09
Binary files /dev/null and b/public/kindeditor/plugins/filemanager/images/folder-64.gif differ
diff --git a/public/kindeditor/plugins/filemanager/images/go-up.gif b/public/kindeditor/plugins/filemanager/images/go-up.gif
new file mode 100644
index 0000000..92ae23d
Binary files /dev/null and b/public/kindeditor/plugins/filemanager/images/go-up.gif differ
diff --git a/public/kindeditor/plugins/fixtoolbar/fixtoolbar.js b/public/kindeditor/plugins/fixtoolbar/fixtoolbar.js
new file mode 100644
index 0000000..7a16fca
--- /dev/null
+++ b/public/kindeditor/plugins/fixtoolbar/fixtoolbar.js
@@ -0,0 +1,35 @@
+/**
+ * Created by chenyihong on 14/12/4.
+ */
+
+KindEditor.plugin('fixtoolbar', function (K) {
+    var self = this;
+    if (!self.fixToolBar) {
+        return;
+    }
+
+    function init() {
+        var toolbar = K('.ke-toolbar');
+        var originY = toolbar.pos().y;
+        K(window).bind('scroll', function () {
+            if (toolbar.css('position') == 'fixed') {
+                if(document.body.scrollTop - originY < 0){
+                    toolbar.css('position', 'static');
+                    toolbar.css('top', 'auto');
+                }
+            } else {
+                if (toolbar.pos().y - document.body.scrollTop < 0) {
+                    toolbar.css('position', 'fixed');
+                    toolbar.css('top', 0);
+                }
+            }
+        });
+    }
+
+    if (self.isCreated) {
+        init();
+    } else {
+        self.afterCreate(init);
+    }
+
+});
diff --git a/public/kindeditor/plugins/flash/flash.js b/public/kindeditor/plugins/flash/flash.js
new file mode 100644
index 0000000..d5d465e
--- /dev/null
+++ b/public/kindeditor/plugins/flash/flash.js
@@ -0,0 +1,161 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
diff --git a/public/kindeditor/plugins/image/image.js b/public/kindeditor/plugins/image/image.js
new file mode 100644
index 0000000..69029ed
--- /dev/null
+++ b/public/kindeditor/plugins/image/image.js
@@ -0,0 +1,328 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
diff --git a/public/kindeditor/plugins/image/images/align_left.gif b/public/kindeditor/plugins/image/images/align_left.gif
new file mode 100644
index 0000000..ab17f56
Binary files /dev/null and b/public/kindeditor/plugins/image/images/align_left.gif differ
diff --git a/public/kindeditor/plugins/image/images/align_right.gif b/public/kindeditor/plugins/image/images/align_right.gif
new file mode 100644
index 0000000..e8ebe6a
Binary files /dev/null and b/public/kindeditor/plugins/image/images/align_right.gif differ
diff --git a/public/kindeditor/plugins/image/images/align_top.gif b/public/kindeditor/plugins/image/images/align_top.gif
new file mode 100644
index 0000000..d8826a5
Binary files /dev/null and b/public/kindeditor/plugins/image/images/align_top.gif differ
diff --git a/public/kindeditor/plugins/image/images/refresh.png b/public/kindeditor/plugins/image/images/refresh.png
new file mode 100644
index 0000000..77e12d1
Binary files /dev/null and b/public/kindeditor/plugins/image/images/refresh.png differ
diff --git a/public/kindeditor/plugins/insertfile/insertfile.js b/public/kindeditor/plugins/insertfile/insertfile.js
new file mode 100644
index 0000000..b8c523e
--- /dev/null
+++ b/public/kindeditor/plugins/insertfile/insertfile.js
@@ -0,0 +1,138 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
diff --git a/public/kindeditor/plugins/lineheight/lineheight.js b/public/kindeditor/plugins/lineheight/lineheight.js
new file mode 100644
index 0000000..ae679d7
--- /dev/null
+++ b/public/kindeditor/plugins/lineheight/lineheight.js
@@ -0,0 +1,38 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
diff --git a/public/kindeditor/plugins/link/link.js b/public/kindeditor/plugins/link/link.js
new file mode 100644
index 0000000..352fa3c
--- /dev/null
+++ b/public/kindeditor/plugins/link/link.js
@@ -0,0 +1,66 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
diff --git a/public/kindeditor/plugins/map/map.html b/public/kindeditor/plugins/map/map.html
new file mode 100644
index 0000000..fb27555
--- /dev/null
+++ b/public/kindeditor/plugins/map/map.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+	<head>
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+	<style>
+		html { height: 100% }
+		body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		#map_canvas { height: 100% }
+	</style>
+	<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=zh_CN"></script>
+	<script>
+		var map, geocoder;
+		function initialize() {
+			var latlng = new google.maps.LatLng(-34.397, 150.644);
+			var options = {
+				zoom: 11,
+				center: latlng,
+				disableDefaultUI: true,
+				panControl: true,
+				zoomControl: true,
+				mapTypeControl: true,
+				scaleControl: true,
+				streetViewControl: false,
+				overviewMapControl: true,
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+			};
+			map = new google.maps.Map(document.getElementById("map_canvas"), options);
+			geocoder = new google.maps.Geocoder();
+			geocoder.geocode({latLng: latlng}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					if (results[3]) {
+						parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;
+					}
+				}
+			});
+		}
+		function search(address) {
+			if (!map) return;
+			geocoder.geocode({address : address}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					map.setZoom(11);
+					map.setCenter(results[0].geometry.location);
+					var marker = new google.maps.Marker({
+						map: map,
+						position: results[0].geometry.location
+					});
+				} else {
+					alert("Invalid address: " + address);
+				}
+			});
+		}
+	</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/public/kindeditor/plugins/map/map.js b/public/kindeditor/plugins/map/map.js
new file mode 100644
index 0000000..5290875
--- /dev/null
+++ b/public/kindeditor/plugins/map/map.js
@@ -0,0 +1,137 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/public/kindeditor/plugins/media/media.js b/public/kindeditor/plugins/media/media.js
new file mode 100644
index 0000000..5803466
--- /dev/null
+++ b/public/kindeditor/plugins/media/media.js
@@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
diff --git a/public/kindeditor/plugins/multiimage/images/image.png b/public/kindeditor/plugins/multiimage/images/image.png
new file mode 100644
index 0000000..fe79cf0
Binary files /dev/null and b/public/kindeditor/plugins/multiimage/images/image.png differ
diff --git a/public/kindeditor/plugins/multiimage/images/select-files-en.png b/public/kindeditor/plugins/multiimage/images/select-files-en.png
new file mode 100644
index 0000000..a926a6e
Binary files /dev/null and b/public/kindeditor/plugins/multiimage/images/select-files-en.png differ
diff --git a/public/kindeditor/plugins/multiimage/images/select-files-zh-CN.png b/public/kindeditor/plugins/multiimage/images/select-files-zh-CN.png
new file mode 100644
index 0000000..5a31d36
Binary files /dev/null and b/public/kindeditor/plugins/multiimage/images/select-files-zh-CN.png differ
diff --git a/public/kindeditor/plugins/multiimage/images/swfupload.swf b/public/kindeditor/plugins/multiimage/images/swfupload.swf
new file mode 100644
index 0000000..e3f7670
Binary files /dev/null and b/public/kindeditor/plugins/multiimage/images/swfupload.swf differ
diff --git a/public/kindeditor/plugins/multiimage/multiimage.js b/public/kindeditor/plugins/multiimage/multiimage.js
new file mode 100644
index 0000000..bb629c8
--- /dev/null
+++ b/public/kindeditor/plugins/multiimage/multiimage.js
@@ -0,0 +1,1384 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh-CN' ? 'select-files-zh-CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh-CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
diff --git a/public/kindeditor/plugins/pagebreak/pagebreak.js b/public/kindeditor/plugins/pagebreak/pagebreak.js
new file mode 100644
index 0000000..dfa883a
--- /dev/null
+++ b/public/kindeditor/plugins/pagebreak/pagebreak.js
@@ -0,0 +1,27 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
diff --git a/public/kindeditor/plugins/plainpaste/plainpaste.js b/public/kindeditor/plugins/plainpaste/plainpaste.js
new file mode 100644
index 0000000..8f7bed8
--- /dev/null
+++ b/public/kindeditor/plugins/plainpaste/plainpaste.js
@@ -0,0 +1,41 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/public/kindeditor/plugins/preview/preview.js b/public/kindeditor/plugins/preview/preview.js
new file mode 100644
index 0000000..ef6e2cf
--- /dev/null
+++ b/public/kindeditor/plugins/preview/preview.js
@@ -0,0 +1,31 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/public/kindeditor/plugins/quickformat/quickformat.js b/public/kindeditor/plugins/quickformat/quickformat.js
new file mode 100644
index 0000000..5b98c72
--- /dev/null
+++ b/public/kindeditor/plugins/quickformat/quickformat.js
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*/
\ No newline at end of file
diff --git a/public/kindeditor/plugins/table/table.js b/public/kindeditor/plugins/table/table.js
new file mode 100644
index 0000000..4033b6a
--- /dev/null
+++ b/public/kindeditor/plugins/table/table.js
@@ -0,0 +1,712 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
diff --git a/public/kindeditor/plugins/template/html/1.html b/public/kindeditor/plugins/template/html/1.html
new file mode 100644
index 0000000..034126b
--- /dev/null
+++ b/public/kindeditor/plugins/template/html/1.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		<img align="left" height="100" style="margin-right: 10px" width="100" />在此处输入标题
+	</h3>
+	<p>
+		在此处输入内容
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/kindeditor/plugins/template/html/2.html b/public/kindeditor/plugins/template/html/2.html
new file mode 100644
index 0000000..dc2584a
--- /dev/null
+++ b/public/kindeditor/plugins/template/html/2.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		标题
+	</h3>
+	<table style="width:100%;" cellpadding="2" cellspacing="0" border="1">
+		<tbody>
+			<tr>
+				<td>
+					<h3>标题1</h3>
+				</td>
+				<td>
+					<h3>标题1</h3>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容1
+				</td>
+				<td>
+					内容2
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容3
+				</td>
+				<td>
+					内容4
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<p>
+		表格说明
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/kindeditor/plugins/template/html/3.html b/public/kindeditor/plugins/template/html/3.html
new file mode 100644
index 0000000..873f0c6
--- /dev/null
+++ b/public/kindeditor/plugins/template/html/3.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<p>
+		在此处输入内容
+	</p>
+	<ol>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ol>
+	<p>
+		在此处输入内容
+	</p>
+	<ul>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/public/kindeditor/plugins/template/template.js b/public/kindeditor/plugins/template/template.js
new file mode 100644
index 0000000..4029e87
--- /dev/null
+++ b/public/kindeditor/plugins/template/template.js
@@ -0,0 +1,58 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
diff --git a/public/kindeditor/plugins/wordpaste/wordpaste.js b/public/kindeditor/plugins/wordpaste/wordpaste.js
new file mode 100644
index 0000000..22061e1
--- /dev/null
+++ b/public/kindeditor/plugins/wordpaste/wordpaste.js
@@ -0,0 +1,51 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/public/kindeditor/themes/common/anchor.gif b/public/kindeditor/themes/common/anchor.gif
new file mode 100644
index 0000000..61145ea
Binary files /dev/null and b/public/kindeditor/themes/common/anchor.gif differ
diff --git a/public/kindeditor/themes/common/blank.gif b/public/kindeditor/themes/common/blank.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/public/kindeditor/themes/common/blank.gif differ
diff --git a/public/kindeditor/themes/common/flash.gif b/public/kindeditor/themes/common/flash.gif
new file mode 100644
index 0000000..2cb12b2
Binary files /dev/null and b/public/kindeditor/themes/common/flash.gif differ
diff --git a/public/kindeditor/themes/common/loading.gif b/public/kindeditor/themes/common/loading.gif
new file mode 100644
index 0000000..c69e937
Binary files /dev/null and b/public/kindeditor/themes/common/loading.gif differ
diff --git a/public/kindeditor/themes/common/media.gif b/public/kindeditor/themes/common/media.gif
new file mode 100644
index 0000000..e1c0e30
Binary files /dev/null and b/public/kindeditor/themes/common/media.gif differ
diff --git a/public/kindeditor/themes/common/rm.gif b/public/kindeditor/themes/common/rm.gif
new file mode 100644
index 0000000..d013d55
Binary files /dev/null and b/public/kindeditor/themes/common/rm.gif differ
diff --git a/public/kindeditor/themes/default/background.png b/public/kindeditor/themes/default/background.png
new file mode 100644
index 0000000..e59bd68
Binary files /dev/null and b/public/kindeditor/themes/default/background.png differ
diff --git a/public/kindeditor/themes/default/default.css b/public/kindeditor/themes/default/default.css
new file mode 100644
index 0000000..3f72660
--- /dev/null
+++ b/public/kindeditor/themes/default/default.css
@@ -0,0 +1,1147 @@
+/* common */
+.ke-inline-block {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-clearfix {
+	zoom: 1;
+}
+.ke-clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	font-size: 0;
+	height: 0;
+	line-height: 0;
+	visibility: hidden;
+}
+.ke-shadow {
+	box-shadow: 1px 1px 3px #A0A0A0;
+	-moz-box-shadow: 1px 1px 3px #A0A0A0;
+	-webkit-box-shadow: 1px 1px 3px #A0A0A0;
+	filter: progid:DXImageTransform.Microsoft.Shadow(color='#A0A0A0', Direction=135, Strength=3);
+	background-color: #F0F0EE;
+}
+.ke-menu a,
+.ke-menu a:hover,
+.ke-dialog a,
+.ke-dialog a:hover {
+	color: #337FE5;
+	text-decoration: none;
+}
+/* icons */
+.ke-icon-source {
+	background-position: 0px 0px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-preview {
+	background-position: 0px -16px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-print {
+	background-position: 0px -32px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-undo {
+	background-position: 0px -48px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-redo {
+	background-position: 0px -64px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-cut {
+	background-position: 0px -80px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-copy {
+	background-position: 0px -96px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-paste {
+	background-position: 0px -112px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-selectall {
+	background-position: 0px -128px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyleft {
+	background-position: 0px -144px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifycenter {
+	background-position: 0px -160px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyright {
+	background-position: 0px -176px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyfull {
+	background-position: 0px -192px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertorderedlist {
+	background-position: 0px -208px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertunorderedlist {
+	background-position: 0px -224px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-indent {
+	background-position: 0px -240px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-outdent {
+	background-position: 0px -256px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-subscript {
+	background-position: 0px -272px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-superscript {
+	background-position: 0px -288px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-date {
+	background-position: 0px -304px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-time {
+	background-position: 0px -320px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-formatblock {
+	background-position: 0px -336px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-fontname {
+	background-position: 0px -352px;
+	width: 21px;
+	height: 16px;
+}
+.ke-icon-fontsize {
+	background-position: 0px -368px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-forecolor {
+	background-position: 0px -384px;
+	width: 20px;
+	height: 16px;
+}
+.ke-icon-hilitecolor {
+	background-position: 0px -400px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-bold {
+	background-position: 0px -416px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-italic {
+	background-position: 0px -432px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-underline {
+	background-position: 0px -448px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-strikethrough {
+	background-position: 0px -464px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-removeformat {
+	background-position: 0px -480px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-image {
+	background-position: 0px -496px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-flash {
+	background-position: 0px -512px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-media {
+	background-position: 0px -528px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-div {
+	background-position: 0px -544px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-formula {
+	background-position: 0px -576px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-hr {
+	background-position: 0px -592px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-emoticons {
+	background-position: 0px -608px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-link {
+	background-position: 0px -624px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-unlink {
+	background-position: 0px -640px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-fullscreen {
+	background-position: 0px -656px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-about {
+	background-position: 0px -672px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-plainpaste {
+	background-position: 0px -704px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-wordpaste {
+	background-position: 0px -720px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-table {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablemenu {
+	background-position: 0px -768px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableinsert {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tabledelete {
+	background-position: 0px -800px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertleft {
+	background-position: 0px -816px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertright {
+	background-position: 0px -832px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertabove {
+	background-position: 0px -848px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertbelow {
+	background-position: 0px -864px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecoldelete {
+	background-position: 0px -880px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowdelete {
+	background-position: 0px -896px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellprop {
+	background-position: 0px -912px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableprop {
+	background-position: 0px -928px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-checked {
+	background-position: 0px -944px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-code {
+	background-position: 0px -960px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-map {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-baidumap {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-lineheight {
+	background-position: 0px -992px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-clearhtml {
+	background-position: 0px -1008px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-pagebreak {
+	background-position: 0px -1024px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertfile {
+	background-position: 0px -1040px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-quickformat {
+	background-position: 0px -1056px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-template {
+	background-position: 0px -1072px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellsplit {
+	background-position: 0px -1088px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowmerge {
+	background-position: 0px -1104px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowsplit {
+	background-position: 0px -1120px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolmerge {
+	background-position: 0px -1136px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolsplit {
+	background-position: 0px -1152px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-anchor {
+	background-position: 0px -1168px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-search {
+	background-position: 0px -1184px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-new {
+	background-position: 0px -1200px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-specialchar {
+	background-position: 0px -1216px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-multiimage {
+	background-position: 0px -1232px;
+	width: 16px;
+	height: 16px;
+}
+/* container */
+.ke-container {
+	display: block;
+	border: 1px solid #CCCCCC;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #F0F0EE;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon {
+	background-repeat: no-repeat;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+}
+.ke-toolbar-icon-url {
+	background-image: url(default.png);
+}
+.ke-toolbar .ke-outline {
+	border: 1px solid #F0F0EE;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-toolbar .ke-disabled {
+	cursor: default;
+}
+.ke-toolbar .ke-separator {
+	height: 16px;
+	margin: 2px 3px;
+	border-left: 1px solid #A0A0A0;
+	border-right: 1px solid #FFFFFF;
+	border-top:0;
+	border-bottom:0;
+	width: 0;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-hr {
+	overflow: hidden;
+	height: 1px;
+	clear: both;
+}
+/* edit */
+.ke-edit {
+	padding: 0;
+}
+.ke-edit-iframe,
+.ke-edit-textarea {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	overflow: auto;
+}
+.ke-edit-textarea {
+	font: 12px/1.5 "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	color: #000;
+	overflow: auto;
+	resize: none;
+}
+.ke-edit-textarea:focus {
+	outline: none;
+}
+/* statusbar */
+.ke-statusbar {
+	position: relative;
+	background-color: #F0F0EE;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+.ke-statusbar-center-icon {
+	background-position: -0px -754px;
+	width: 15px;
+	height: 11px;
+	background-image: url(default.png);
+}
+.ke-statusbar-right-icon {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize;
+	background-position: -5px -741px;
+	width: 11px;
+	height: 11px;
+	background-image: url(default.png);
+}
+/* menu */
+.ke-menu {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-item {
+	border: 1px solid #F1F1F1;
+	background-color: #F1F1F1;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-menu-item-left {
+	width: 27px;
+	text-align: center;
+	overflow: hidden;
+}
+.ke-menu-item-center {
+	width: 0;
+	height: 24px;
+	border-left: 1px solid #E3E3E3;
+	border-right: 1px solid #FFFFFF;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ke-menu-item-center-on {
+	border-left: 1px solid #E9EFF6;
+	border-right: 1px solid #E9EFF6;
+}
+.ke-menu-item-right {
+	border: 0;
+	padding: 0 0 0 5px;
+	line-height: 24px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-separator {
+	margin: 2px 0;
+	height: 0;
+	overflow: hidden;
+	border-top: 1px solid #CCCCCC;
+	border-bottom: 1px solid #FFFFFF;
+	border-left: 0;
+	border-right: 0;
+}
+/* colorpicker */
+.ke-colorpicker {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse: separate;
+}
+.ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
+.ke-colorpicker-cell-color {
+	width: 14px;
+	height: 14px;
+	margin: 3px;
+	padding: 0;
+	border: 0;
+}
+/* dialog */
+.ke-dialog {
+	position: absolute;
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
+.ke-dialog-content {
+	background-color: #FFF;
+	width: 100%;
+	height: 100%;
+	color: #333;
+	border: 1px solid #A0A0A0;
+}
+.ke-dialog-shadow {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-shadow: 3px 3px 7px #999;
+	-moz-box-shadow: 3px 3px 7px #999;
+	-webkit-box-shadow: 3px 3px 7px #999;
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3', MakeShadow='true', ShadowOpacity='0.4');
+	background-color: #F0F0EE;
+}
+.ke-dialog-header {
+	border:0;
+	margin:0;
+	padding: 0 10px;
+	background: url(background.png) repeat scroll 0 0 #F0F0EE;
+	border-bottom: 1px solid #CFCFCF;
+	height: 24px;
+	font: 12px/24px "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	color: #222;
+	cursor: move;
+}
+.ke-dialog-icon-close {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 6px;
+	top: 6px;
+	cursor: pointer;
+}
+.ke-dialog-body {
+	font: 12px/1.5 "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	overflow: hidden;
+	width: 100%;
+}
+.ke-dialog-body textarea {
+	display: block;
+	overflow: auto;
+	padding: 0;
+	resize: none;
+}
+.ke-dialog-body textarea:focus,
+.ke-dialog-body input:focus,
+.ke-dialog-body select:focus {
+	outline: none;
+}
+.ke-dialog-body label {
+	margin-right: 10px;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body img {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body select {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+	width: auto;
+}
+.ke-dialog-body .ke-textarea {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+.ke-dialog-body .ke-form {
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog-loading {
+	position: absolute;
+	top: 0;
+	left: 1px;
+	z-index: 1;
+	text-align: center;
+}
+.ke-dialog-loading-content {
+	background: url("../common/loading.gif") no-repeat;
+    color: #666;
+    font-size: 14px;
+    font-weight: bold;
+    height: 31px;
+    line-height: 31px;
+    padding-left: 36px;
+}
+.ke-dialog-row {
+	margin-bottom: 10px;
+}
+.ke-dialog-footer {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	text-align: right;
+	padding:0 0 5px 0;
+	background-color: #FFF;
+	width: 100%;
+}
+.ke-dialog-preview,
+.ke-dialog-yes {
+	margin: 5px;
+}
+.ke-dialog-no {
+	margin: 5px 10px 5px 5px;
+}
+.ke-dialog-mask {
+	background-color:#FFF;
+	filter:alpha(opacity=50);
+	opacity:0.5;
+}
+.ke-button-common {
+	background: url(background.png) no-repeat;
+	cursor: pointer;
+	height: 23px;
+	line-height: 23px;
+	overflow: visible;
+	display: inline-block;
+	vertical-align: top;
+	cursor: pointer;
+}
+.ke-button-outer {
+	background-position: 0 -25px;
+	padding: 0;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-button {
+	background-position: right -25px;
+	padding: 0 14px 0 12px;
+	margin: 0 0 0 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	border: 0 none;
+	color: #333;
+	font-size: 12px;
+	text-decoration: none;
+}
+/* inputbox */
+.ke-input-text {
+	background-color:#FFFFFF;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 17px;
+	height: 17px;
+	padding: 2px 4px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-input-number {
+	width: 50px;
+}
+.ke-input-color {
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	font-size: 12px;
+	width: 60px;
+	height: 20px;
+	line-height: 20px;
+	padding-left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-upload-button {
+	position: relative;
+}
+.ke-upload-area {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+	*height: 25px;
+}
+.ke-upload-area .ke-upload-file {
+	position: absolute;
+	font-size: 60px;
+	top: 0;
+	right: 0;
+	padding: 0;
+	margin: 0;
+	z-index: 811212;
+	border: 0 none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* tabs */
+.ke-tabs {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	border-bottom:1px solid #A0A0A0;
+	padding-left:5px;
+	margin-bottom:20px;
+}
+.ke-tabs-ul  {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+.ke-tabs-li {
+	position: relative;
+	border: 1px solid #A0A0A0;
+	background-color: #F0F0EE;
+	margin: 0 2px -1px 0;
+	padding: 0 20px;
+	float: left;
+	line-height: 25px;
+	text-align: center;
+	color: #555555;
+	cursor: pointer;
+}
+.ke-tabs-li-selected {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+	color: #000;
+	cursor: default;
+}
+.ke-tabs-li-on {
+	background-color: #FFF;
+	color: #000;
+}
+/* progressbar */
+.ke-progressbar {
+	position: relative;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-bar {
+	border: 1px solid #6FA5DB;
+	width: 80px;
+	height: 5px;
+	margin: 10px 10px 0 10px;
+	padding: 0;
+}
+.ke-progressbar-bar-inner {
+	width: 0;
+	height: 5px;
+	background-color: #6FA5DB;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-percent {
+	position: absolute;
+	top: 0;
+	left: 40%;
+	display: none;
+}
+/* swfupload */
+.ke-swfupload-top {
+	position: relative;
+	margin-bottom: 10px;
+	_width: 608px;
+}
+.ke-swfupload-button {
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-desc {
+	padding: 0 10px;
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-startupload {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.ke-swfupload-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-swfupload-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-swfupload-body .ke-photo {
+	position: relative;
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-swfupload-body .ke-delete {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	cursor: pointer;
+}
+.ke-swfupload-body .ke-status  {
+	position: absolute;
+	left: 0;
+	bottom: 5px;
+	width: 100px;
+	height: 17px;
+}
+.ke-swfupload-body .ke-message  {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:17px;
+}
+.ke-swfupload-body .ke-error  {
+	color: red;
+}
+.ke-swfupload-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-swfupload-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+
+/* emoticons */
+.ke-plugin-emoticons {
+	position: relative;
+}
+.ke-plugin-emoticons .ke-preview {
+	position: absolute;
+	text-align: center;
+	margin: 2px;
+	padding: 10px;
+	top: 0;
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	display: none;
+}
+.ke-plugin-emoticons .ke-preview-img {
+	border:0;
+	margin:0;
+	padding:0;
+}
+.ke-plugin-emoticons .ke-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse:separate;
+}
+.ke-plugin-emoticons .ke-cell {
+	margin:0;
+	padding:1px;
+	border:1px solid #F0F0EE;
+	cursor:pointer;
+}
+.ke-plugin-emoticons .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-emoticons .ke-img {
+	display:block;
+	background-repeat:no-repeat;
+	overflow:hidden;
+	margin:2px;
+	width:24px;
+	height:24px;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-emoticons .ke-page {
+	text-align: right;
+	margin: 5px;
+	padding: 0;
+	border: 0;
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	color: #333;
+	text-decoration: none;
+}
+.ke-plugin-plainpaste-textarea,
+.ke-plugin-wordpaste-iframe {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+/* filemanager */
+.ke-plugin-filemanager-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-plugin-filemanager-header .ke-left {
+	float: left;
+}
+.ke-plugin-filemanager-header .ke-right {
+	float: right;
+}
+.ke-plugin-filemanager-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-plugin-filemanager-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-plugin-filemanager-body .ke-photo {
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-plugin-filemanager-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-plugin-filemanager-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-filemanager-body .ke-table {
+	width: 95%;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	border-collapse: separate;
+}
+.ke-plugin-filemanager-body .ke-table .ke-cell {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-filemanager-body .ke-table .ke-name {
+	width: 55%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-size {
+	width: 15%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-datetime {
+	width: 30%;
+	text-align: center;
+}
+
diff --git a/public/kindeditor/themes/default/default.png b/public/kindeditor/themes/default/default.png
new file mode 100644
index 0000000..cc9e72d
Binary files /dev/null and b/public/kindeditor/themes/default/default.png differ
diff --git a/public/kindeditor/themes/qq/editor.gif b/public/kindeditor/themes/qq/editor.gif
new file mode 100644
index 0000000..b256841
Binary files /dev/null and b/public/kindeditor/themes/qq/editor.gif differ
diff --git a/public/kindeditor/themes/qq/qq.css b/public/kindeditor/themes/qq/qq.css
new file mode 100644
index 0000000..a45e08c
--- /dev/null
+++ b/public/kindeditor/themes/qq/qq.css
@@ -0,0 +1,143 @@
+/* container */
+.ke-container-qq {
+	display: block;
+	border: 1px solid #c3c3c3;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-container-qq .ke-toolbar {
+	border-bottom: 1px solid #c3c3c3;
+	background-color: #FFFFFF;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon-url {
+	background-image: url(editor.gif);
+	width:18px;
+	*xwidth:20px;
+	height:18px;
+	*xheight:20px;
+}
+.ke-icon-checked{
+	background-image: url(../default/default.png);
+	width:16px;
+	height:16px;
+}
+.ke-container-qq .ke-icon-bold{
+	background-position: 4px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -27px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -28px 1px;
+}
+.ke-container-qq .ke-icon-underline{
+	background-position: -60px 1px;
+}
+.ke-container-qq .ke-icon-fontname{
+	background-position: -95px 1px;
+}
+.ke-container-qq .ke-icon-fontsize{
+	background-position: -128px 1px;
+}
+.ke-container-qq .ke-icon-forecolor{
+	background-position: -159px 1px;
+}
+.ke-container-qq .ke-icon-hilitecolor{
+	background-position: -190px 1px;
+}
+.ke-container-qq .ke-icon-plug-align{
+	background-position: -223px 1px;
+}
+.plug-align-justifyleft{
+	background-position: -350px 1px;
+}
+.plug-align-justifycenter{
+	background-position: -382px 1px;
+}
+.plug-align-justifyright{
+	background-position: -414px 1px;
+}
+.plug-order-insertorderedlist{
+	background-position: -446px 1px;
+}
+.plug-order-insertunorderedlist{
+	background-position: -477px 1px;
+}
+.plug-indent-indent{
+	background-position: -513px 1px;
+}
+.plug-indent-outdent{
+	background-position: -545px 1px;
+}
+.ke-container-qq .ke-icon-plug-order{
+	background-position: -255px 1px;
+}
+.ke-container-qq .ke-icon-plug-indent{
+	background-position: -287px 1px;
+}
+.ke-container-qq .ke-icon-link{
+	background-position: -319px 1px;
+}
+
+.ke-container-qq .ke-toolbar .ke-outline {
+	cursor: default;
+	padding:0px;
+	border:1px solid #fff;
+}
+.ke-container-qq .ke-toolbar .ke-on {
+	border-left:1px solid white;
+	border-top:1px solid white;
+	border-right:1px solid gray;
+	border-bottom:1px solid gray;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar .ke-selected {
+	border-left:1px solid gray;
+	border-top:1px solid gray;
+	border-right:1px solid white;
+	border-bottom:1px solid white;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+
+.ke-colorpicker-qq{
+	background:#fff;
+}
+/* statusbar */
+.ke-container-qq .ke-statusbar {
+	display:none;
+}
+/* menu */
+.ke-menu-qq {
+	border:1px solid #a6a6a6;
+	position:absolute;
+	background:#fff;
+	-moz-box-shadow:2px 2px 4px #DDDDDD;
+	z-index:999;
+	left:-400px;
+	top:-386px;
+	right:218px;
+	width:130px;
+}
+.ke-menu-qq .ke-menu-item {
+	padding:0px;
+	background:#fff;
+}
+.ke-menu-qq .ke-menu-item-on {
+	border:1px solid #000080;background:#FFEEC2;color:#036;
+}
+.ke-menu-qq .ke-toolbar .ke-selected {
+	border:1px solid #9a9afb;
+}
+.ke-menu-qq .ke-menu-item-left{
+	width:auto;
+}
diff --git a/public/kindeditor/themes/simple/simple.css b/public/kindeditor/themes/simple/simple.css
new file mode 100644
index 0000000..4c76cf9
--- /dev/null
+++ b/public/kindeditor/themes/simple/simple.css
@@ -0,0 +1,100 @@
+/* container */
+.ke-container-simple {
+	display: block;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+	overflow: hidden;
+}
+/* toolbar */
+.ke-container-simple .ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #FFF;
+	padding: 2px 5px;
+	overflow: hidden;
+}
+.ke-container-simple .ke-toolbar .ke-outline {
+	border: 1px solid #FFF;
+	background-color: transparent;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-container-simple .ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-container-simple .ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-container-simple .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+/* statusbar */
+.ke-container-simple .ke-statusbar {
+	position: relative;
+	background-color: #FFF;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+/* menu */
+.ke-menu-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FFF;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-simple .ke-menu-item {
+	border: 1px solid #FFF;
+	background-color: #FFF;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-simple .ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #FFF;
+}
+/* colorpicker */
+.ke-colorpicker-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FEFEFE;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
diff --git a/root/.svn/entries b/root/.svn/entries
new file mode 100644
index 0000000..0b2e934
--- /dev/null
+++ b/root/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/root
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+sqltool.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.961702Z
+8973cbfd2fb7b8b4433a0a8d410f3ed5
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+675
+
+setup.aspx
+file
+
+
+
+
+2011-04-01T02:51:03.977327Z
+dff58c2d5f2dcfa73fc6bfdcd6abef5b
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+586
+
+sqltool.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:03.992953Z
+9c175756895a2430447ddf95a188d32d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+404
+
+setup.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:04.117953Z
+28f4d18b99036aec5ba5875872acb5b7
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+518
+
diff --git a/root/.svn/text-base/setup.aspx.cs.svn-base b/root/.svn/text-base/setup.aspx.cs.svn-base
new file mode 100644
index 0000000..c50dc4d
--- /dev/null
+++ b/root/.svn/text-base/setup.aspx.cs.svn-base
@@ -0,0 +1,24 @@
+using System;
+using ZhangPu.Gov.Data.Model;
+
+public partial class setup : PageBase
+{
+    private Setup _obj;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        _obj = new Setup();
+    }
+     
+    protected void btnCleanProjects_Click(object sender, EventArgs e)
+    {
+
+        _obj.initializingProjects();
+    }
+    protected void btndeleteNews_Click(object sender, EventArgs e)
+    {
+        RoleEmpExt obj = new RoleEmpExt();
+        _obj.initializingNews();
+    }
+
+
+}
diff --git a/root/.svn/text-base/setup.aspx.svn-base b/root/.svn/text-base/setup.aspx.svn-base
new file mode 100644
index 0000000..7cdb59c
--- /dev/null
+++ b/root/.svn/text-base/setup.aspx.svn-base
@@ -0,0 +1,11 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="setup.aspx.cs" Inherits="setup" Title="Setup" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <asp:Button id="btnCleanProjects" runat="server" OnClick="btnCleanProjects_Click"
+        Text="项目清除" />
+    <asp:Button id="btndeleteNews" runat="server" OnClick="btndeleteNews_Click"
+        Text="信息清除" />
+     
+</asp:Content>
+
diff --git a/root/.svn/text-base/sqltool.aspx.cs.svn-base b/root/.svn/text-base/sqltool.aspx.cs.svn-base
new file mode 100644
index 0000000..8021f7e
--- /dev/null
+++ b/root/.svn/text-base/sqltool.aspx.cs.svn-base
@@ -0,0 +1,17 @@
+using System;
+using ZhangPu.Gov.Data.Model;
+
+public partial class root_sqltool : PageBase
+{
+    private Setup _obj;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        _obj = new Setup();
+    }
+     
+    protected void btnExe_Click(object sender, EventArgs e)
+    {
+      GridView1.DataSource =  _obj.exeSql(txtsql.Text.Trim());
+      GridView1.DataBind();
+    }
+}
diff --git a/root/.svn/text-base/sqltool.aspx.svn-base b/root/.svn/text-base/sqltool.aspx.svn-base
new file mode 100644
index 0000000..bec97ed
--- /dev/null
+++ b/root/.svn/text-base/sqltool.aspx.svn-base
@@ -0,0 +1,38 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="sqltool.aspx.cs" Inherits="root_sqltool" Title="Untitled Page" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+<table width="100%">
+<tr>
+<td>
+    <asp:TextBox ID="txtsql" runat="server" Height="119px" TextMode="MultiLine" Width="785px"></asp:TextBox></td>
+
+
+</tr>
+<tr>
+<td>
+    <asp:Button ID="btnExe" runat="server" OnClick="btnExe_Click" Text="执行" /></td>
+
+
+</tr>
+<tr>
+<td>
+    <asp:GridView ID="GridView1" runat="server">
+    </asp:GridView>
+</td>
+
+
+</tr>
+
+
+
+
+
+
+</table>
+
+
+
+
+
+</asp:Content>
+
diff --git a/root/setup.aspx b/root/setup.aspx
new file mode 100644
index 0000000..7cdb59c
--- /dev/null
+++ b/root/setup.aspx
@@ -0,0 +1,11 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="setup.aspx.cs" Inherits="setup" Title="Setup" %>
+
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <asp:Button id="btnCleanProjects" runat="server" OnClick="btnCleanProjects_Click"
+        Text="项目清除" />
+    <asp:Button id="btndeleteNews" runat="server" OnClick="btndeleteNews_Click"
+        Text="信息清除" />
+     
+</asp:Content>
+
diff --git a/root/setup.aspx.cs b/root/setup.aspx.cs
new file mode 100644
index 0000000..53847c5
--- /dev/null
+++ b/root/setup.aspx.cs
@@ -0,0 +1,24 @@
+using System;
+using DeiNiu.wms.Data.Model;
+
+public partial class setup : PageBase
+{
+    private Setup _obj;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        _obj = new Setup();
+    }
+     
+    protected void btnCleanProjects_Click(object sender, EventArgs e)
+    {
+
+        _obj.initializingProjects();
+    }
+    protected void btndeleteNews_Click(object sender, EventArgs e)
+    {
+        RoleEmp obj = new RoleEmp();
+        _obj.initializingNews();
+    }
+
+
+}
diff --git a/root/sqltool.aspx b/root/sqltool.aspx
new file mode 100644
index 0000000..bec97ed
--- /dev/null
+++ b/root/sqltool.aspx
@@ -0,0 +1,38 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="sqltool.aspx.cs" Inherits="root_sqltool" Title="Untitled Page" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+<table width="100%">
+<tr>
+<td>
+    <asp:TextBox ID="txtsql" runat="server" Height="119px" TextMode="MultiLine" Width="785px"></asp:TextBox></td>
+
+
+</tr>
+<tr>
+<td>
+    <asp:Button ID="btnExe" runat="server" OnClick="btnExe_Click" Text="执行" /></td>
+
+
+</tr>
+<tr>
+<td>
+    <asp:GridView ID="GridView1" runat="server">
+    </asp:GridView>
+</td>
+
+
+</tr>
+
+
+
+
+
+
+</table>
+
+
+
+
+
+</asp:Content>
+
diff --git a/root/sqltool.aspx.cs b/root/sqltool.aspx.cs
new file mode 100644
index 0000000..4d800b1
--- /dev/null
+++ b/root/sqltool.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using DeiNiu.wms.Data.Model;
+
+public partial class root_sqltool : PageBase
+{
+    private Setup _obj;
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        _obj = new Setup();
+    }
+     
+    protected void btnExe_Click(object sender, EventArgs e)
+    {
+      GridView1.DataSource =  _obj.exeSql(txtsql.Text.Trim());
+      GridView1.DataBind();
+    }
+}
diff --git a/showImage.aspx b/showImage.aspx
new file mode 100644
index 0000000..d8fdf74
--- /dev/null
+++ b/showImage.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="showImage.aspx.cs" Inherits="utils_showImage" %>
+
+<!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 runat="server">
+    <title>无标题页</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+    
+    </div>
+    </form>
+</body>
+</html>
diff --git a/showImage.aspx.cs b/showImage.aspx.cs
new file mode 100644
index 0000000..50a6094
--- /dev/null
+++ b/showImage.aspx.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Drawing;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class utils_showImage : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        // 创建一个包含随机内容的验证码文本
+        System.Random rand = new Random();
+        int len = rand.Next(2,4);
+        char[] chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
+        System.Text.StringBuilder myStr = new System.Text.StringBuilder();
+        for (int iCount = 0; iCount < len; iCount++)
+        {
+            myStr.Append(chars[rand.Next(chars.Length)]);
+        }
+        string text = myStr.ToString();
+        // 保存验证码到 session 中以便其他模块使用
+        this.Session["checkcode"] = text;
+        Size ImageSize = Size.Empty;
+        Font myFont = new Font("MS Sans Serif", 18);
+        // 计算验证码图片大小
+        using (Bitmap bmp = new Bitmap(10, 10))
+        {
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                SizeF size = g.MeasureString(text, myFont, 10000);
+                ImageSize.Width = (int)size.Width + 8;
+                ImageSize.Height = (int)size.Height + 8;
+            }
+        }
+        // 创建验证码图片
+        using (Bitmap bmp = new Bitmap(ImageSize.Width, ImageSize.Height))
+        {
+            // 绘制验证码文本
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                g.Clear(Color.White);
+                using (StringFormat f = new StringFormat())
+                {
+                    f.Alignment = StringAlignment.Near;
+                    f.LineAlignment = StringAlignment.Center;
+                    f.FormatFlags = StringFormatFlags.NoWrap;
+                    g.DrawString(
+                        text,
+                        myFont,
+                        Brushes.Black,
+                        new RectangleF(
+                        0,
+                        0,
+                        ImageSize.Width,
+                        ImageSize.Height),
+                        f);
+                }//using
+            }//using
+            // 制造噪声 杂点面积占图片面积的 30%
+            int num = ImageSize.Width * ImageSize.Height * 30 / 100;
+            for (int iCount = 0; iCount < num; iCount++)
+            {
+                // 在随机的位置使用随机的颜色设置图片的像素
+                int x = rand.Next(ImageSize.Width);
+                int y = rand.Next(ImageSize.Height);
+                int r = rand.Next(255);
+                int g = rand.Next(255);
+                int b = rand.Next(255);
+                Color c = Color.FromArgb(r, g, b);
+                bmp.SetPixel(x, y, c);
+            }//for
+            // 输出图片
+            System.IO.MemoryStream ms = new System.IO.MemoryStream();
+            bmp.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+            this.Response.ContentType = "image/png";
+            ms.WriteTo(this.Response.OutputStream);
+            ms.Close();
+        }//using
+        myFont.Dispose();
+    }
+
+    /// <summary>
+    /// 检查指定的文本是否匹配验证码
+    /// </summary>
+    /// <param name="text">要判断的文本</param>
+    /// <returns>是否匹配</returns>
+    public static bool CheckCode(string text)
+    {
+        string txt = System.Web.HttpContext.Current.Session["checkcode"] as string;
+        return text == txt;
+    }
+}
diff --git a/test.aspx b/test.aspx
new file mode 100644
index 0000000..6729c4b
--- /dev/null
+++ b/test.aspx
@@ -0,0 +1,5 @@
+<%@ Page Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="test.aspx.cs" Inherits="test" Title="Untitled Page" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+    <asp:Button id="Button1" runat="server" OnClick="Button1_Click" Text="Button" />
+</asp:Content>
+
diff --git a/test.aspx.cs b/test.aspx.cs
new file mode 100644
index 0000000..098a275
--- /dev/null
+++ b/test.aspx.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class test : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        Button1.Text="test close ie";
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+        if ((Session["CurrentUser"] != null))
+        {
+
+            if (System.Configuration.ConfigurationManager.AppSettings["sessionstate"] != "InProc")
+                if (Session["CurrentUserId"] != null)
+                {
+                    //   ((ArrayList)Application["userlst"]).Remove(Session["CurrentUserAccount"].ToString());
+                    DeiNiu.RequestLog logobj = new DeiNiu.RequestLog();
+                    logobj.LogoutLog(int.Parse(Session["CurrentUserId"].ToString()));
+                }
+        }
+    }
+}
diff --git a/ug/.svn/entries b/ug/.svn/entries
new file mode 100644
index 0000000..8ed9316
--- /dev/null
+++ b/ug/.svn/entries
@@ -0,0 +1,139 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/ug
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+Dict
+dir
+
+Project
+dir
+
+training
+dir
+
+login.html
+file
+
+
+
+
+2011-04-01T02:51:11.821128Z
+f3b8f1cb6cd225ca0c08d19b12ac596b
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+920
+
+desktop.html
+file
+
+
+
+
+2011-04-01T02:51:11.836753Z
+bb99be830a12624fd79d7eb141dee8b5
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1186
+
+nohelpdoc.html
+file
+
+
+
+
+2011-04-01T02:51:11.836753Z
+eccdd2f415d749b357941ccb65d46799
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+466
+
diff --git a/ug/.svn/text-base/desktop.html.svn-base b/ug/.svn/text-base/desktop.html.svn-base
new file mode 100644
index 0000000..e8adb7d
--- /dev/null
+++ b/ug/.svn/text-base/desktop.html.svn-base
@@ -0,0 +1,36 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<strong>����˵����<br/><br/></strong>
+
+
+��ҳ�����û���¼ϵͳ�����ҳ�棬���ڼ�����ʾ�͵�¼�û���ص���Ϣ��
+����֮�¹��������֣�
+<ul>
+<li> ϵͳ��ʾ��          ��ϸչʾ�û�����Ŀ�Ϳγ���Ϣ
+<li> ������־���ƻ�      ��ʾ�û��ƶ����¼�ĵ�����Ժ�����Ĺ����ƻ�����־��
+<li>������Ϣ��ϵͳ��Ϣ   ������Ϣ�����ṩ�������޸ĵĹ��ܡ�ϵͳ��Ϣ�ṩ�˵�ǰ���������Ա�б���
+ </ul>
+<hr />
+<strong><br /> ����˵����<br/><br/>
+  </strong> �޸�����
+<ul>
+<li> ���������Ϣ->�޸�����
+<li>����ԭ���롢������
+<li>����޸İ�ť���������������롣
+<li>���ȡ����ť�����������޸ģ�ԭ���뽫������Ч��
+</ul>
+<hr />
+<strong>�ر���ʾ��<br/><br/></strong>
+<ul>
+<li>�޸������ԭ��������ʧЧ������Ӱ�쵱ǰ�Ự�����´ε�¼ʱ��ʹ�����趨�������롣 
+<li>
+ҳ�������Ϊ���������֣����Ϊ�û�Ȩ���б����Ҳ�Ϊ����������ϵͳ��¼������й���ҳ�涼���Ǵ˲��֣�����������ҳ�治���ἰ��
+</ul>
+</body>
+</html>
diff --git a/ug/.svn/text-base/login.html.svn-base b/ug/.svn/text-base/login.html.svn-base
new file mode 100644
index 0000000..5e9e851
--- /dev/null
+++ b/ug/.svn/text-base/login.html.svn-base
@@ -0,0 +1,30 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>
+��ҳ����ϵͳ�ĵ�¼ҳ�棬ϵͳ�����û�����ĵ�¼��Ϣ����֤��ʶ�û����ݵĺϷ��ԣ���֤ͨ���������û���¼ϵͳ�����к���Ȩ����ƥ���ҵ�������</p>
+<hr />
+  <strong>����˵����<br/>
+  <br/>
+  </strong>
+ 
+<li> 
+�����û��������뼰��֤�룬�����¼��ť��
+<li>��֤ͨ��������û�����ҳ�档
+<li>��֤ʧ����
+  ��ʾ�� <strong>�û���¼��Ϣ�������������롱</strong> ��
+<li>���ȡ����ť������ϵͳ��ҳ��
+
+<hr />
+<strong>�ر���ʾ��<br/><br/></strong>
+<li>�û�������֤�벻���ִ�Сд�������ϸ����ִ�Сд��
+<li> ��֤��ͼƬ���������˫��ͼƬ��ϵͳ���漴�����µ���֤�롣
+</body>
+</html>
diff --git a/ug/.svn/text-base/nohelpdoc.html.svn-base b/ug/.svn/text-base/nohelpdoc.html.svn-base
new file mode 100644
index 0000000..9a99317
--- /dev/null
+++ b/ug/.svn/text-base/nohelpdoc.html.svn-base
@@ -0,0 +1,20 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+<style type="text/css">
+<!--
+.STYLE1 {
+	font-size: 36px;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<span class="STYLE1">û���ҵ���Ӧ�İ����ļ���</span>
+</body>
+
+</html>
diff --git a/ug/Dict/.svn/entries b/ug/Dict/.svn/entries
new file mode 100644
index 0000000..a77f634
--- /dev/null
+++ b/ug/Dict/.svn/entries
@@ -0,0 +1,232 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/ug/Dict
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+DeptEmp.html
+file
+
+
+
+
+2011-04-01T02:51:10.758621Z
+9952d108f4b9dcbf53a91be90a114e80
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1412
+
+DeptMain.html
+file
+
+
+
+
+2011-04-01T02:51:10.758621Z
+ca495b138ac4016bf46a5f7cce006006
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1863
+
+RoleAuth.html
+file
+
+
+
+
+2011-04-01T02:51:10.774246Z
+6543cda2a4456bba4bb8149451cbe8e1
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1453
+
+RoleEmp.html
+file
+
+
+
+
+2011-04-01T02:51:10.774246Z
+2251e78f2f9d75666e29df92c67d2110
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1461
+
+EmployeeMain.html
+file
+
+
+
+
+2011-04-01T02:51:10.789871Z
+0f99543ad761717aaf268630841fc78f
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1955
+
+RoleMain.html
+file
+
+
+
+
+2011-04-01T02:51:10.789871Z
+aab67f96e399b95e68929e5ea3b9a37c
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1774
+
diff --git a/ug/Dict/.svn/text-base/DeptEmp.html.svn-base b/ug/Dict/.svn/text-base/DeptEmp.html.svn-base
new file mode 100644
index 0000000..00682cf
--- /dev/null
+++ b/ug/Dict/.svn/text-base/DeptEmp.html.svn-base
@@ -0,0 +1,41 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����Զ��û���������֯�ܹ������ٷ��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�û������������û������ڵ����Դ����ֱ�ʾ��</li>
+    <li>������</li>
+    <li>�û����������б�</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�û��������</strong>
+   <ul>
+     <li>���ѡ������������û��ڵ㣨�����֣�</li>
+     <li>��ѡ�е��û������IJ��Ž����Ҳ���������ֱ��������б�����ʽչ�֡�</li>
+     <li> ����м����Ľڵ�ǰ�ĸ�ѡ��ѡ�л�ȡ��ѡ���û����ڵIJ��š�</li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�����Ҳ���û����������б�����Զ��û��ڸò��ŵ�ְ����б༭
+  <ul>
+    <li>���<img src="../../Images/edit.gif" width="18" height="18" /></li>
+    <li>���ı�������ְ��</li>
+    <li>���<img src="../../Images/save.gif" width="16" height="16" />�����޸ģ����<img src="../../Images/undo.gif" width="16" height="16" />�����޸ġ�</li>
+  </ul>
+ </ul>
+</body>
+</html>
diff --git a/ug/Dict/.svn/text-base/DeptMain.html.svn-base b/ug/Dict/.svn/text-base/DeptMain.html.svn-base
new file mode 100644
index 0000000..53a9e15
--- /dev/null
+++ b/ug/Dict/.svn/text-base/DeptMain.html.svn-base
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�����֯�ܹ���</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��֯�ܹ���״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�������</strong>
+   <ul>
+     <li>�����ಿ����������ڵ㣬�ýڵ��µIJ��Ž����Ҳ��б���ʾ��</li>
+     <li>����Ҳ����ⲿ�ŵı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳಿ���б���չʾ�ò��ŵ���ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.��������</strong>
+   <ul>
+      <li>����Ҳಿ���б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������IJ�����Ϣ����������Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�������Ž�Ĭ�ϱ����ڵ�ǰ��ѡ����֮�¡�<strong><br/>
+      </strong> </li>
+     </ul>
+
+<strong><br/>
+2.�����޸�</strong>
+   <ul>
+      <li>���ò������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըò�����Ϣ��������Ҫ�ı༭������ע�ⲿ�����Ʋ���Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.����ɾ��</strong>
+   <ul>
+      <li>�����ɾ�������Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+ </ul>
+</body>
+</html>
diff --git a/ug/Dict/.svn/text-base/EmployeeMain.html.svn-base b/ug/Dict/.svn/text-base/EmployeeMain.html.svn-base
new file mode 100644
index 0000000..bb63c2f
--- /dev/null
+++ b/ug/Dict/.svn/text-base/EmployeeMain.html.svn-base
@@ -0,0 +1,61 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�������Ϣ��</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��֯�ܹ���״ͼ </li>
+    <li>�û���ʾ���༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�û����</strong>
+   <ul>
+     <li>�����ಿ����������ڵ㣬�ò��Žڵ��µ��û������Ҳ��б���ʾ��</li>
+     <li>����Ҳ������û��ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ��û��б���չʾ���û�����ϸ��Ϣ��<br/>
+     </li>
+   </ul>
+<strong><br/>
+2.�û�����</strong>
+   <ul>
+      <li>���ѡ�в�����������ӵ��û������IJ���</li>
+      <li>����û��б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����������û�����Ϣ���û��������˺�Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>����Ա����Ĭ�ϱ����ڵ�ǰ��ѡ����֮�¡�<strong><br/>
+      </strong> </li>
+     </ul>
+
+<strong><br/>
+2.�û��޸�</strong>
+   <ul>
+      <li>�����޸��û����ڱ༭״̬</li>
+      <li>�ڱ༭�������Ը��û���Ϣ����Ҫ�ı༭�������û��������˺Ų���Ϊ�ա�</li>
+     <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�û�ɾ��</strong>
+   <ul>
+      <li>�����ɾ�����û��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�����û�ʱ��һ��Ҫ��ȷ���������IJ��š�
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+</ul>
+</body>
+</html>
diff --git a/ug/Dict/.svn/text-base/RoleAuth.html.svn-base b/ug/Dict/.svn/text-base/RoleAuth.html.svn-base
new file mode 100644
index 0000000..34c42b0
--- /dev/null
+++ b/ug/Dict/.svn/text-base/RoleAuth.html.svn-base
@@ -0,0 +1,45 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڶԽ�ɫ����Ȩ�޷��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б�</li>
+    <li>Ȩ���б�</li>
+    <li><span id="ctl00_ContentPlaceHolder1_lbRoleEm">Ȩ�ޡ���ɫ����Ա <span id="ctl00_ContentPlaceHolder1_lbRoleEm">�� ��ϵ</span>��ͼ</span> </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ����</strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��е�Ҫ����Ľ�ɫ��</li>
+     <li>��Ȩ���б���ѡ/����ѡ Ҫ����/ȡ����Ȩ�ޡ� </li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+<strong><br/>
+ <br/>
+2.�鿴</strong><strong>��ɫ����Ա��Ȩ�޵� ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��еĽ�ɫ��<strong>��ɫ��Ա�嵥</strong> ����ʾ��ӵ�иý�ɫ����Ա�嵥��</li>
+     <li>��Ȩ���б��е��ϸ���ֵ�Ȩ�����ƣ�<strong>Ȩ�޽�ɫ�嵥</strong>��<strong> Ȩ����Ա�嵥</strong> ����ʾӵ����ѡ��Ȩ�޵Ľ�ɫ����Ա�б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li> �� 
+ </ul>
+,
+</body>
+</html>
diff --git a/ug/Dict/.svn/text-base/RoleEmp.html.svn-base b/ug/Dict/.svn/text-base/RoleEmp.html.svn-base
new file mode 100644
index 0000000..689eae4
--- /dev/null
+++ b/ug/Dict/.svn/text-base/RoleEmp.html.svn-base
@@ -0,0 +1,45 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڶ���Ա���н�ɫ���䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б�</li>
+    <li>������Ա��</li>
+    <li><span id="ctl00_ContentPlaceHolder1_lbRoleEm">��ɫ����Ա��Ȩ��<span id="ctl00_ContentPlaceHolder1_lbRoleEm">�� ��ϵ</span>��ͼ</span> </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ����</strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��е�Ҫ����Ľ�ɫ��</li>
+     <li>�ڲ�����Ա����ѡ/����ѡ Ҫ����/ȡ�� ѡ����ɫ����Ա�� </li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+<strong><br/>
+ <br/>
+2.�鿴</strong><strong>��ɫ����Ա��Ȩ�޵� ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��еĽ�ɫ��<strong>��ɫ��Ա�嵥</strong> ����ʾ��ӵ�иý�ɫ����Ա�嵥��</li>
+     <li>�ڲ�����Ա���е���������Ա���ƣ�<strong>��Ա��ɫ�嵥</strong>��<strong> ��ԱȨ���嵥</strong> ����ʾ��ѡ����Ա�Ľ�ɫ��Ȩ���б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li> �� 
+ </ul>
+,
+</body>
+</html>
diff --git a/ug/Dict/.svn/text-base/RoleMain.html.svn-base b/ug/Dict/.svn/text-base/RoleMain.html.svn-base
new file mode 100644
index 0000000..78baf78
--- /dev/null
+++ b/ug/Dict/.svn/text-base/RoleMain.html.svn-base
@@ -0,0 +1,58 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�����֯�ܹ���</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б� </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ���</strong><ul>
+   <li>����Ҳ������ɫ�ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+   <li>�����Ҳ��ɫ�б���չʾ�ý�ɫ����ϸ��Ϣ��</li>
+   <li><br/>
+   </li>
+   </ul>
+   <strong><br/>
+2.��ɫ����</strong>
+   <ul>
+      <li>����Ҳ��ɫ�б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ľ�ɫ��Ϣ����ɫ���ƺ�����Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.��ɫ�޸�</strong>
+   <ul>
+      <li>�������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ը���Ϣ��������Ҫ�ı༭������ע���ɫ���ƺ�����Ϊ���������Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.��ɫɾ��</strong>
+   <ul>
+      <li>�����ɾ���Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ�
+<li><strong>��˽�ɫ</strong>��ʾ�ý�ɫΪ�������ר�á�
+</ul>
+</body>
+</html>
diff --git a/ug/Dict/DeptEmp.html b/ug/Dict/DeptEmp.html
new file mode 100644
index 0000000..00682cf
--- /dev/null
+++ b/ug/Dict/DeptEmp.html
@@ -0,0 +1,41 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����Զ��û���������֯�ܹ������ٷ��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�û������������û������ڵ����Դ����ֱ�ʾ��</li>
+    <li>������</li>
+    <li>�û����������б�</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�û��������</strong>
+   <ul>
+     <li>���ѡ������������û��ڵ㣨�����֣�</li>
+     <li>��ѡ�е��û������IJ��Ž����Ҳ���������ֱ��������б�����ʽչ�֡�</li>
+     <li> ����м����Ľڵ�ǰ�ĸ�ѡ��ѡ�л�ȡ��ѡ���û����ڵIJ��š�</li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�����Ҳ���û����������б�����Զ��û��ڸò��ŵ�ְ����б༭
+  <ul>
+    <li>���<img src="../../Images/edit.gif" width="18" height="18" /></li>
+    <li>���ı�������ְ��</li>
+    <li>���<img src="../../Images/save.gif" width="16" height="16" />�����޸ģ����<img src="../../Images/undo.gif" width="16" height="16" />�����޸ġ�</li>
+  </ul>
+ </ul>
+</body>
+</html>
diff --git a/ug/Dict/DeptMain.html b/ug/Dict/DeptMain.html
new file mode 100644
index 0000000..53a9e15
--- /dev/null
+++ b/ug/Dict/DeptMain.html
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�����֯�ܹ���</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��֯�ܹ���״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�������</strong>
+   <ul>
+     <li>�����ಿ����������ڵ㣬�ýڵ��µIJ��Ž����Ҳ��б���ʾ��</li>
+     <li>����Ҳ����ⲿ�ŵı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳಿ���б���չʾ�ò��ŵ���ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.��������</strong>
+   <ul>
+      <li>����Ҳಿ���б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������IJ�����Ϣ����������Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�������Ž�Ĭ�ϱ����ڵ�ǰ��ѡ����֮�¡�<strong><br/>
+      </strong> </li>
+     </ul>
+
+<strong><br/>
+2.�����޸�</strong>
+   <ul>
+      <li>���ò������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըò�����Ϣ��������Ҫ�ı༭������ע�ⲿ�����Ʋ���Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.����ɾ��</strong>
+   <ul>
+      <li>�����ɾ�������Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+ </ul>
+</body>
+</html>
diff --git a/ug/Dict/EmployeeMain.html b/ug/Dict/EmployeeMain.html
new file mode 100644
index 0000000..bb63c2f
--- /dev/null
+++ b/ug/Dict/EmployeeMain.html
@@ -0,0 +1,61 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�������Ϣ��</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��֯�ܹ���״ͼ </li>
+    <li>�û���ʾ���༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�û����</strong>
+   <ul>
+     <li>�����ಿ����������ڵ㣬�ò��Žڵ��µ��û������Ҳ��б���ʾ��</li>
+     <li>����Ҳ������û��ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ��û��б���չʾ���û�����ϸ��Ϣ��<br/>
+     </li>
+   </ul>
+<strong><br/>
+2.�û�����</strong>
+   <ul>
+      <li>���ѡ�в�����������ӵ��û������IJ���</li>
+      <li>����û��б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����������û�����Ϣ���û��������˺�Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>����Ա����Ĭ�ϱ����ڵ�ǰ��ѡ����֮�¡�<strong><br/>
+      </strong> </li>
+     </ul>
+
+<strong><br/>
+2.�û��޸�</strong>
+   <ul>
+      <li>�����޸��û����ڱ༭״̬</li>
+      <li>�ڱ༭�������Ը��û���Ϣ����Ҫ�ı༭�������û��������˺Ų���Ϊ�ա�</li>
+     <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�û�ɾ��</strong>
+   <ul>
+      <li>�����ɾ�����û��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�����û�ʱ��һ��Ҫ��ȷ���������IJ��š�
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+</ul>
+</body>
+</html>
diff --git a/ug/Dict/RoleAuth.html b/ug/Dict/RoleAuth.html
new file mode 100644
index 0000000..34c42b0
--- /dev/null
+++ b/ug/Dict/RoleAuth.html
@@ -0,0 +1,45 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڶԽ�ɫ����Ȩ�޷��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б�</li>
+    <li>Ȩ���б�</li>
+    <li><span id="ctl00_ContentPlaceHolder1_lbRoleEm">Ȩ�ޡ���ɫ����Ա <span id="ctl00_ContentPlaceHolder1_lbRoleEm">�� ��ϵ</span>��ͼ</span> </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ����</strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��е�Ҫ����Ľ�ɫ��</li>
+     <li>��Ȩ���б���ѡ/����ѡ Ҫ����/ȡ����Ȩ�ޡ� </li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+<strong><br/>
+ <br/>
+2.�鿴</strong><strong>��ɫ����Ա��Ȩ�޵� ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��еĽ�ɫ��<strong>��ɫ��Ա�嵥</strong> ����ʾ��ӵ�иý�ɫ����Ա�嵥��</li>
+     <li>��Ȩ���б��е��ϸ���ֵ�Ȩ�����ƣ�<strong>Ȩ�޽�ɫ�嵥</strong>��<strong> Ȩ����Ա�嵥</strong> ����ʾӵ����ѡ��Ȩ�޵Ľ�ɫ����Ա�б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li> �� 
+ </ul>
+,
+</body>
+</html>
diff --git a/ug/Dict/RoleEmp.html b/ug/Dict/RoleEmp.html
new file mode 100644
index 0000000..689eae4
--- /dev/null
+++ b/ug/Dict/RoleEmp.html
@@ -0,0 +1,45 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڶ���Ա���н�ɫ���䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б�</li>
+    <li>������Ա��</li>
+    <li><span id="ctl00_ContentPlaceHolder1_lbRoleEm">��ɫ����Ա��Ȩ��<span id="ctl00_ContentPlaceHolder1_lbRoleEm">�� ��ϵ</span>��ͼ</span> </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ����</strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��е�Ҫ����Ľ�ɫ��</li>
+     <li>�ڲ�����Ա����ѡ/����ѡ Ҫ����/ȡ�� ѡ����ɫ����Ա�� </li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+<strong><br/>
+ <br/>
+2.�鿴</strong><strong>��ɫ����Ա��Ȩ�޵� ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ��������ɫ�б��еĽ�ɫ��<strong>��ɫ��Ա�嵥</strong> ����ʾ��ӵ�иý�ɫ����Ա�嵥��</li>
+     <li>�ڲ�����Ա���е���������Ա���ƣ�<strong>��Ա��ɫ�嵥</strong>��<strong> ��ԱȨ���嵥</strong> ����ʾ��ѡ����Ա�Ľ�ɫ��Ȩ���б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li> �� 
+ </ul>
+,
+</body>
+</html>
diff --git a/ug/Dict/RoleMain.html b/ug/Dict/RoleMain.html
new file mode 100644
index 0000000..78baf78
--- /dev/null
+++ b/ug/Dict/RoleMain.html
@@ -0,0 +1,58 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ������ά��ϵͳ�û�����֯�ܹ���</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��ɫ�б� </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��ɫ���</strong><ul>
+   <li>����Ҳ������ɫ�ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+   <li>�����Ҳ��ɫ�б���չʾ�ý�ɫ����ϸ��Ϣ��</li>
+   <li><br/>
+   </li>
+   </ul>
+   <strong><br/>
+2.��ɫ����</strong>
+   <ul>
+      <li>����Ҳ��ɫ�б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ľ�ɫ��Ϣ����ɫ���ƺ�����Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.��ɫ�޸�</strong>
+   <ul>
+      <li>�������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ը���Ϣ��������Ҫ�ı༭������ע���ɫ���ƺ�����Ϊ���������Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.��ɫɾ��</strong>
+   <ul>
+      <li>�����ɾ���Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ�
+<li><strong>��˽�ɫ</strong>��ʾ�ý�ɫΪ�������ר�á�
+</ul>
+</body>
+</html>
diff --git a/ug/Project/.svn/entries b/ug/Project/.svn/entries
new file mode 100644
index 0000000..c0b4444
--- /dev/null
+++ b/ug/Project/.svn/entries
@@ -0,0 +1,232 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/ug/Project
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+WorkReport.html
+file
+
+
+
+
+2011-04-01T02:51:11.305499Z
+48034c22783b283b77a13a3ac206313f
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1806
+
+ProjectsQuery.html
+file
+
+
+
+
+2011-04-01T02:51:11.321124Z
+0c82ae96e32884ccc95280ef54f4ce59
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1356
+
+WorkPlanMain.html
+file
+
+
+
+
+2011-04-01T02:51:11.336750Z
+c2c46a3d7ba821e8dac3728896c8987a
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1735
+
+ProjectApprove.html
+file
+
+
+
+
+2011-04-01T02:51:11.336750Z
+52fa44439479b1b54a2dd02d2cf89a68
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2708
+
+ProjectCenter.html
+file
+
+
+
+
+2011-04-01T02:51:11.352375Z
+6c5e7b974e86f22857e8320ced2f2998
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2112
+
+ProjectMain.html
+file
+
+
+
+
+2011-04-01T02:51:11.368000Z
+36d46f898e5360aaf09196928a9b070d
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3958
+
diff --git a/ug/Project/.svn/text-base/ProjectApprove.html.svn-base b/ug/Project/.svn/text-base/ProjectApprove.html.svn-base
new file mode 100644
index 0000000..630f4fa
--- /dev/null
+++ b/ug/Project/.svn/text-base/ProjectApprove.html.svn-base
@@ -0,0 +1,63 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<link href="ZhangPuStyle.css" type="text/css" rel="stylesheet" />
+<title>ϵͳ����</title></head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����û������Ŀ����ҳ�棬�ɽ�����Ŀ����׼������������</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�б� </li>
+    <li>��Ŀ��ϸ�༭ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> <strong><br/>
+      </strong></li>
+   </ul>
+<strong><br/>
+2.��������</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>����༭��ť������Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ȵ���ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>��� <strong>����ͨ��</strong> ��ť������Ŀͨ����������� <strong>��������</strong> ��ť������Ŀδ��ͨ������������<strong><br/>
+     </strong> </li>
+   </ul>
+
+<strong><br/>
+2.������ɾ����Ŀ����</strong>
+   <ul>
+      <li>�����Ŀ�Ҳ�༭��λ��<img src="../../Images/detail.gif" width="18" height="18" />��ť</li>
+      <li>����Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��</li>
+      <li>���뱾�����������</li>
+     <li>����Ŀͨ����������� <strong>����ͨ��</strong> ��ť����Ŀδ��ͨ���������������� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.��Ŀ��������</strong>
+   <ul>
+      <li>�����Ŀ�Ҳ�༭��λ��<img src="../../Images/edit.gif" width="18" height="18" />��ť</li>
+      <li>����Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��</li>
+      <li>���뱾�����������</li>
+     <li>����Ŀ����ͨ����������� <strong>����ͨ��</strong> ��ť����Ŀ����δ��ͨ���������������� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�������Ϊ�����
+ <li>����û��ͨ���ģ���Ŀ�����ظ���Ŀ�����ˡ�
+ </ul>
+</body>
+</html>
diff --git a/ug/Project/.svn/text-base/ProjectCenter.html.svn-base b/ug/Project/.svn/text-base/ProjectCenter.html.svn-base
new file mode 100644
index 0000000..62cb6e3
--- /dev/null
+++ b/ug/Project/.svn/text-base/ProjectCenter.html.svn-base
@@ -0,0 +1,52 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ��������Ŀ��Ϣ���ϴ�������������Ŀ�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�����������Ŀ���ˡ���Ա�����ŵ�������Ŀ�б�����Ŀ��ϸ </li>
+    <li>��Ŀ�ϴ� </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>�����ʾ�������IJ��ż���Ա�б������Զ���Ŀ�б�������Ա���ŵ�����������Ա�Դ�������ʾ����û��������������ʾ��������Ҳ�޷�ʹ����Ŀ��������ܡ�</li>
+     <li>��Ŀ��ѯ�����޶���Ŀ���ƽ��в�ѯ��</li>
+     <li>Ĭ��ÿҳ��ʾ20����Ŀ��Ϣ������20�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> </li>
+     <li><strong><br/>
+     </strong></li>
+   </ul>
+   <strong><br/>
+ 2.�鿴��Ŀ��ϸ</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>���������ť������Ŀ������ѡ��״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ȵ���ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>�����Զ���Ŀ���б༭�� </li>
+</ul>
+   <strong><br/>
+   <br/>
+3.��Ŀ�ϴ�</strong><strong>  <br />
+</strong><br />
+  <ul>
+    <li>����Ŀ�ϴ����򣬵��<strong>���</strong>��ť��ѡ����ϴ���Excel�ļ����ȷ����</li>
+    <li>���<strong>�ϴ���Ŀ</strong>��ť������ϴ�������</li>
+</ul>
+  <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>������Ŀ�ϴ���Excel�ĵ���غ�ʵ���������������</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/.svn/text-base/ProjectMain.html.svn-base b/ug/Project/.svn/text-base/ProjectMain.html.svn-base
new file mode 100644
index 0000000..dc0ee21
--- /dev/null
+++ b/ug/Project/.svn/text-base/ProjectMain.html.svn-base
@@ -0,0 +1,103 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����û�������������Ŀ����ҳ�棬�ɽ�����Ŀ����������¡��������롢ɾ�����롢�¶��ύ����Ȳ�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�б� </li>
+    <li>��Ŀ��ϸ�༭ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> <strong><br/>
+      </strong></li>
+   </ul>
+   <strong><br/>
+ 2.��Ŀ�༭</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>����༭��ť������Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>����Ŀ����δ�ύ��״̬�£����Զ���Ŀ�����޸ġ�ɾ������������Ŀ�¶�δ�ύ��״̬�¿��Զ���Ŀ������ϸ���б༭�� </li>
+     <li>������水ť���Ա����������޸� </li>
+   </ul>
+   <strong><br/>
+   <br/>
+3.������Ŀ</strong><strong>  <br /> 
+<br />
+&nbsp;&nbsp;�û������ڵ�ǰѡ��������������Ŀ</strong><br />
+<br />
+  <ul>
+    <li>ѡ��ҳ���������ʱ����Ŀ��<strong> ȫ�� </strong>ѡ� </li>
+    <li>��� <strong>����</strong> ��ť </li>
+    <li>��ҳ���²�����Ŀ��ϸ����
+      ������Ŀ��Ϣ����Ŀ���ơ�Ȩ��Ϊ����� </li>
+    <li>��� <strong>����</strong> ��ť </li>
+  </ul>
+  <br/>
+  <br/>
+  <strong>4.ɾ����Ŀ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;<strong>�û�����ɾ�������״̬����Ŀ</strong><strong>
+</strong>
+  <ul>
+    <li>ѡ��ҳ���������ʱ����Ŀ��<strong> ȫ�� </strong>ѡ� </li>
+    <li>���Ҫɾ������Ŀ�ı༭<img src="../../Images/detail.gif" width="18" height="18" />��ť��</li>
+    <li></li>
+    <li>��ҳ���²�����Ŀ��ϸ����
+      ������Ŀɾ�������ɣ�ɾ��������Ϊ����� </li>
+    <li>��� <strong>ɾ��</strong> ��ť </li>
+    <li><strong>ɾ������ͨ��</strong> �� <strong>����δ�ύ</strong>״̬����Ŀ��������ɾ��������״̬����Ŀ������־Ϊ<strong>ɾ��δ�ύ</strong>״̬��</li>
+  </ul>
+   <br/>
+  <br/>
+  <strong>5.������ɾ����Ŀ�ύ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;�û����Զ�<strong> ����δ�ύ </strong>��<strong> ɾ��δ�ύ </strong>״̬����Ŀ�ύ������
+
+  <ul>
+    <li>�����Ŀ�б���һ�еĸ�ѡ��ѡ����Ŀ�б���<strong>����δ�ύ </strong>��<strong> ɾ��δ�ύ </strong>״̬�Ĵ��ύ����Ŀ��</li>
+    <li>�����Ŀ�б��±ߵ���Ŀ�ύ��ť��</li>
+    <li>��ѡ�е���Ŀ״̬������Ϊ���ύ״̬��</li>
+    <li></li>
+  </ul>
+
+ <br/>
+  <br/>
+  <strong>6.��Ŀ�����ύ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;�û����Զ�<strong> ��Ŀ�ѷ��䡢��������ͨ����</strong><strong> ��������δͨ�� </strong>״̬����Ŀ�����ύ������
+
+  <ul>
+    <li>������༭��Ŀ�Ľ��ȱ༭��ť<img src="../../Images/edit.gif" width="18" height="18" />��</li>
+    <li>������Ŀ������Ϣ����<strong>��ɰٷֱ�</strong>��<strong>ִ�����˵��</strong>���ϴ���Ҫ������ĵ���</li>
+    <li>���<strong>��������</strong>��ť�������޸ĵ���Ϣ��</li>
+    <li>���<strong>�¶��ύ</strong>��ť�ύ����Ŀ���ȡ�</li>
+    <li>Ҳ�������ύ��Ŀ���ȣ������Ŀ�б���һ�еĸ�ѡ��ѡ��Ҫ�ύ����Ŀ�������Ŀ�б��±ߵ���Ŀ�ύ��ť��</li>
+    <li>�ύ����Ŀ�¶�״̬���ı�Ϊ<strong>�¶����ύ</strong>��</li>
+  </ul>
+
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/>
+  </strong>
+<li>
+</body>
+</html>
diff --git a/ug/Project/.svn/text-base/ProjectsQuery.html.svn-base b/ug/Project/.svn/text-base/ProjectsQuery.html.svn-base
new file mode 100644
index 0000000..d15f9b8
--- /dev/null
+++ b/ug/Project/.svn/text-base/ProjectsQuery.html.svn-base
@@ -0,0 +1,34 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�������û���Ч�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ч�����������Ա�����ŵ�������Ŀ�����б�����Ŀ��ϸ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ ��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�����б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>�����ʾ���ż���Ա�����б������Զ���Ŀ�����б�������Ա���ŵ��������в����Դ�������ʾ��</li>
+     <li>�Ҳ����Ŀ�б������������֣����沿����ʾ��ǰѡ����ʱ����ڵ���Ŀ�÷ֻ��ܡ���������б������<img src="../../Images/detail.gif" width="18" height="18" />��ť����Ŀ��ϸ�б��������沿����ʾ��</li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ���ѷ�ҳ����Ŀ�б������½���ʾ���ֵ�ҳ����Ϣ��<strong><br/>
+     </strong></li>
+   </ul>
+   <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>��</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/.svn/text-base/WorkPlanMain.html.svn-base b/ug/Project/.svn/text-base/WorkPlanMain.html.svn-base
new file mode 100644
index 0000000..bafac70
--- /dev/null
+++ b/ug/Project/.svn/text-base/WorkPlanMain.html.svn-base
@@ -0,0 +1,63 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ���û����Լ�¼�ճ�������δ�����칤�����š��������˵ȡ�</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>������</li>
+    <li>��־�б� </li>
+    <li>��־�༭��</li>
+   </ul>
+   <hr />
+    <p><strong>����˵����</strong></p>
+      <br/>
+     
+ <strong>1.�����Ŀ</strong>      
+    <ul>
+     <li>����������ѡ����Ŀ���������ڡ�  
+     <li>���������±��Զ���ʾ�������־��Ŀ�� 
+   </ul>
+   <strong> 
+ 2.������Ŀ</strong>
+   <ul>
+     <li>����������ѡ�о�������� 
+     <li>��� <strong>������¼</strong> ��ť�� 
+     <li>�ڱ༭��������־��Ŀ�ı���;������ˡ� 
+     <li>���<strong>��������</strong>��������������� 
+   </ul>
+    
+   
+  <strong>3.ɾ����Ŀ</strong>
+  <ul>
+    <li>���Ҫɾ������Ŀ��<img src="../../Images/delete.gif" width="18" height="18" />��ť�� 
+    <li>ϵͳ�����ȷ���Ƿ�Ҫɾ�������<strong>ȷ��</strong>����Ŀ��ɾ���� 
+  </ul>
+ 
+  
+  <strong>4.�༭��Ŀ</strong> 
+  <ul>
+    <li>���Ҫ�༭����Ŀ��<img src="../../Images/edit.gif" width="18" height="18" />��ť��</li>
+    <li>��Ŀ��ϸ����ʾ�ڱ༭����</li>
+    <li>�༭��ɺ󣬵��<strong>��������</strong> ��ť����ɶԸ���Ŀ���޸ġ� 
+</ul>
+
+ <hr />
+  <strong>�ر���ʾ�� 
+  <br/>
+  </strong>
+<ul>
+<li>����ͺ��������Ŀ�б����ڸ���<strong>���� </strong>
+��ʾ��
+</li>
+<li> ��Ŀɾ��������Ҳ��һ��ɾ�����������µ���Ŀ��ʹ����һ����������
+</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/.svn/text-base/WorkReport.html.svn-base b/ug/Project/.svn/text-base/WorkReport.html.svn-base
new file mode 100644
index 0000000..65d86f9
--- /dev/null
+++ b/ug/Project/.svn/text-base/WorkReport.html.svn-base
@@ -0,0 +1,53 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ���ù����ܽ��ϴ�����ֱ��������Ա�Ĺ����ܽ�鿴��</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>�����ܽ���ϴ�����ѯ</li>
+    <li>�����ܽ��б�</li>
+    </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�����ܽ��ϴ�</strong>
+   <ul>
+     <li>ѡ�������IJ��š������ܽ����ͣ�������ϴ��ĵ��ļ�Ҫ˵��</li>
+     <li> ���<strong>���</strong> ��ť��ѡ��Ҫ�ϴ����ļ������<strong>�ϴ�</strong>��ť������ϴ�������<strong><br/>
+     </strong></li>
+   </ul>
+   <strong><br/>
+ 2.�����ܽ��ѯ</strong>
+   <ul>
+      <li>ѡ�������IJ��š������ܽ�����  </li>
+      <li>���<strong>��ѯ</strong>��ť<strong><br/>
+       </strong> </li>
+     <li>��ѯ��������Լ��ϴ��Ĺ����ܽἰ��ѡ���ŵ�ֱ�������Ĺ����ܽᡣ</li>
+</ul>
+ <strong><br/>
+ 3.�����ܽ�༭</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/delete.gif" width="18" height="18" />��ť����ɾ�����ϴ��Ĺ����ܽᣬ�Ҳ�<img src="../../Images/detail.gif" width="18" height="18" />��ť���ڲ鿴�����ܽᡣ </li>
+      </ul>
+   <strong><br/>
+   <br/>
+4.��Ŀ�ϴ�</strong><strong>  <br />
+</strong><br />
+  <ul>
+    <li>����Ŀ�ϴ����򣬵��<strong>���</strong>��ť��ѡ����ϴ���Excel�ļ����ȷ����</li>
+    <li>���<strong>�ϴ���Ŀ</strong>��ť������ϴ�������</li>
+</ul>
+  <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>����ɾ����������ֻ����ɾ���Լ��ϴ��Ĺ����ܽᡣ</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/ProjectApprove.html b/ug/Project/ProjectApprove.html
new file mode 100644
index 0000000..630f4fa
--- /dev/null
+++ b/ug/Project/ProjectApprove.html
@@ -0,0 +1,63 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<link href="ZhangPuStyle.css" type="text/css" rel="stylesheet" />
+<title>ϵͳ����</title></head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����û������Ŀ����ҳ�棬�ɽ�����Ŀ����׼������������</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�б� </li>
+    <li>��Ŀ��ϸ�༭ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> <strong><br/>
+      </strong></li>
+   </ul>
+<strong><br/>
+2.��������</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>����༭��ť������Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ȵ���ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>��� <strong>����ͨ��</strong> ��ť������Ŀͨ����������� <strong>��������</strong> ��ť������Ŀδ��ͨ������������<strong><br/>
+     </strong> </li>
+   </ul>
+
+<strong><br/>
+2.������ɾ����Ŀ����</strong>
+   <ul>
+      <li>�����Ŀ�Ҳ�༭��λ��<img src="../../Images/detail.gif" width="18" height="18" />��ť</li>
+      <li>����Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��</li>
+      <li>���뱾�����������</li>
+     <li>����Ŀͨ����������� <strong>����ͨ��</strong> ��ť����Ŀδ��ͨ���������������� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.��Ŀ��������</strong>
+   <ul>
+      <li>�����Ŀ�Ҳ�༭��λ��<img src="../../Images/edit.gif" width="18" height="18" />��ť</li>
+      <li>����Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��</li>
+      <li>���뱾�����������</li>
+     <li>����Ŀ����ͨ����������� <strong>����ͨ��</strong> ��ť����Ŀ����δ��ͨ���������������� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>�������Ϊ�����
+ <li>����û��ͨ���ģ���Ŀ�����ظ���Ŀ�����ˡ�
+ </ul>
+</body>
+</html>
diff --git a/ug/Project/ProjectCenter.html b/ug/Project/ProjectCenter.html
new file mode 100644
index 0000000..62cb6e3
--- /dev/null
+++ b/ug/Project/ProjectCenter.html
@@ -0,0 +1,52 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ��������Ŀ��Ϣ���ϴ�������������Ŀ�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�����������Ŀ���ˡ���Ա�����ŵ�������Ŀ�б�����Ŀ��ϸ </li>
+    <li>��Ŀ�ϴ� </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>�����ʾ�������IJ��ż���Ա�б������Զ���Ŀ�б�������Ա���ŵ�����������Ա�Դ�������ʾ����û��������������ʾ��������Ҳ�޷�ʹ����Ŀ��������ܡ�</li>
+     <li>��Ŀ��ѯ�����޶���Ŀ���ƽ��в�ѯ��</li>
+     <li>Ĭ��ÿҳ��ʾ20����Ŀ��Ϣ������20�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> </li>
+     <li><strong><br/>
+     </strong></li>
+   </ul>
+   <strong><br/>
+ 2.�鿴��Ŀ��ϸ</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>���������ť������Ŀ������ѡ��״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ȵ���ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>�����Զ���Ŀ���б༭�� </li>
+</ul>
+   <strong><br/>
+   <br/>
+3.��Ŀ�ϴ�</strong><strong>  <br />
+</strong><br />
+  <ul>
+    <li>����Ŀ�ϴ����򣬵��<strong>���</strong>��ť��ѡ����ϴ���Excel�ļ����ȷ����</li>
+    <li>���<strong>�ϴ���Ŀ</strong>��ť������ϴ�������</li>
+</ul>
+  <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>������Ŀ�ϴ���Excel�ĵ���غ�ʵ���������������</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/ProjectMain.html b/ug/Project/ProjectMain.html
new file mode 100644
index 0000000..dc0ee21
--- /dev/null
+++ b/ug/Project/ProjectMain.html
@@ -0,0 +1,103 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����û�������������Ŀ����ҳ�棬�ɽ�����Ŀ����������¡��������롢ɾ�����롢�¶��ύ����Ȳ�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ŀ�б� </li>
+    <li>��Ŀ��ϸ�༭ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ����Ŀ�б������½���ʾ��ǰ��ҳ���� </strong> <strong><br/>
+      </strong></li>
+   </ul>
+   <strong><br/>
+ 2.��Ŀ�༭</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/detail.gif" width="18" height="18" />��ť������ʾ��ǰ��Ŀ�Ļ�����Ϣ���Ҳ�<img src="../../Images/edit.gif" width="18" height="18" />��ť������ʾ��Ŀ������Ϣ�� </li>
+     <li>����༭��ť������Ŀ�����ڱ༭״̬����ҳ���ϳʸ�����ʾ״̬������ҳ���²�������ָ���Ŀ����ϸ��Ϣ��<strong><br/>
+       </strong> </li>
+     <li>����Ŀ����δ�ύ��״̬�£����Զ���Ŀ�����޸ġ�ɾ������������Ŀ�¶�δ�ύ��״̬�¿��Զ���Ŀ������ϸ���б༭�� </li>
+     <li>������水ť���Ա����������޸� </li>
+   </ul>
+   <strong><br/>
+   <br/>
+3.������Ŀ</strong><strong>  <br /> 
+<br />
+&nbsp;&nbsp;�û������ڵ�ǰѡ��������������Ŀ</strong><br />
+<br />
+  <ul>
+    <li>ѡ��ҳ���������ʱ����Ŀ��<strong> ȫ�� </strong>ѡ� </li>
+    <li>��� <strong>����</strong> ��ť </li>
+    <li>��ҳ���²�����Ŀ��ϸ����
+      ������Ŀ��Ϣ����Ŀ���ơ�Ȩ��Ϊ����� </li>
+    <li>��� <strong>����</strong> ��ť </li>
+  </ul>
+  <br/>
+  <br/>
+  <strong>4.ɾ����Ŀ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;<strong>�û�����ɾ�������״̬����Ŀ</strong><strong>
+</strong>
+  <ul>
+    <li>ѡ��ҳ���������ʱ����Ŀ��<strong> ȫ�� </strong>ѡ� </li>
+    <li>���Ҫɾ������Ŀ�ı༭<img src="../../Images/detail.gif" width="18" height="18" />��ť��</li>
+    <li></li>
+    <li>��ҳ���²�����Ŀ��ϸ����
+      ������Ŀɾ�������ɣ�ɾ��������Ϊ����� </li>
+    <li>��� <strong>ɾ��</strong> ��ť </li>
+    <li><strong>ɾ������ͨ��</strong> �� <strong>����δ�ύ</strong>״̬����Ŀ��������ɾ��������״̬����Ŀ������־Ϊ<strong>ɾ��δ�ύ</strong>״̬��</li>
+  </ul>
+   <br/>
+  <br/>
+  <strong>5.������ɾ����Ŀ�ύ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;�û����Զ�<strong> ����δ�ύ </strong>��<strong> ɾ��δ�ύ </strong>״̬����Ŀ�ύ������
+
+  <ul>
+    <li>�����Ŀ�б���һ�еĸ�ѡ��ѡ����Ŀ�б���<strong>����δ�ύ </strong>��<strong> ɾ��δ�ύ </strong>״̬�Ĵ��ύ����Ŀ��</li>
+    <li>�����Ŀ�б��±ߵ���Ŀ�ύ��ť��</li>
+    <li>��ѡ�е���Ŀ״̬������Ϊ���ύ״̬��</li>
+    <li></li>
+  </ul>
+
+ <br/>
+  <br/>
+  <strong>6.��Ŀ�����ύ</strong>
+ 
+  <br/>
+  <br/>
+&nbsp;&nbsp;�û����Զ�<strong> ��Ŀ�ѷ��䡢��������ͨ����</strong><strong> ��������δͨ�� </strong>״̬����Ŀ�����ύ������
+
+  <ul>
+    <li>������༭��Ŀ�Ľ��ȱ༭��ť<img src="../../Images/edit.gif" width="18" height="18" />��</li>
+    <li>������Ŀ������Ϣ����<strong>��ɰٷֱ�</strong>��<strong>ִ�����˵��</strong>���ϴ���Ҫ������ĵ���</li>
+    <li>���<strong>��������</strong>��ť�������޸ĵ���Ϣ��</li>
+    <li>���<strong>�¶��ύ</strong>��ť�ύ����Ŀ���ȡ�</li>
+    <li>Ҳ�������ύ��Ŀ���ȣ������Ŀ�б���һ�еĸ�ѡ��ѡ��Ҫ�ύ����Ŀ�������Ŀ�б��±ߵ���Ŀ�ύ��ť��</li>
+    <li>�ύ����Ŀ�¶�״̬���ı�Ϊ<strong>�¶����ύ</strong>��</li>
+  </ul>
+
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/>
+  </strong>
+<li>
+</body>
+</html>
diff --git a/ug/Project/ProjectsQuery.html b/ug/Project/ProjectsQuery.html
new file mode 100644
index 0000000..d15f9b8
--- /dev/null
+++ b/ug/Project/ProjectsQuery.html
@@ -0,0 +1,34 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�������û���Ч�����</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>��Ŀ����ʱ�䷶Χ </li>
+    <li>��Ч�����������Ա�����ŵ�������Ŀ�����б�����Ŀ��ϸ </li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ ��Ŀ���</strong>
+   <ul>
+     <li>ҳ���϶˵���Ŀʱ����ĿĬ��ֵΪ��ǰ�ꡢ�¡��������ұߵ����°�ť���Ըı���ݵ�ֵ������·ݿ��Ըı��·ݵ�ֵ����Ŀ�����б�������Ӧ��ʾ���趨���ꡢ���µ���Ŀ�б��� </li>
+     <li>�����ʾ���ż���Ա�����б������Զ���Ŀ�����б�������Ա���ŵ��������в����Դ�������ʾ��</li>
+     <li>�Ҳ����Ŀ�б������������֣����沿����ʾ��ǰѡ����ʱ����ڵ���Ŀ�÷ֻ��ܡ���������б������<img src="../../Images/detail.gif" width="18" height="18" />��ť����Ŀ��ϸ�б��������沿����ʾ��</li>
+     <li>Ĭ��ÿҳ��ʾ10����Ŀ��Ϣ������10�����ҳ��ʾ���ѷ�ҳ����Ŀ�б������½���ʾ���ֵ�ҳ����Ϣ��<strong><br/>
+     </strong></li>
+   </ul>
+   <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>��</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/WorkPlanMain.html b/ug/Project/WorkPlanMain.html
new file mode 100644
index 0000000..bafac70
--- /dev/null
+++ b/ug/Project/WorkPlanMain.html
@@ -0,0 +1,63 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ���û����Լ�¼�ճ�������δ�����칤�����š��������˵ȡ�</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>������</li>
+    <li>��־�б� </li>
+    <li>��־�༭��</li>
+   </ul>
+   <hr />
+    <p><strong>����˵����</strong></p>
+      <br/>
+     
+ <strong>1.�����Ŀ</strong>      
+    <ul>
+     <li>����������ѡ����Ŀ���������ڡ�  
+     <li>���������±��Զ���ʾ�������־��Ŀ�� 
+   </ul>
+   <strong> 
+ 2.������Ŀ</strong>
+   <ul>
+     <li>����������ѡ�о�������� 
+     <li>��� <strong>������¼</strong> ��ť�� 
+     <li>�ڱ༭��������־��Ŀ�ı���;������ˡ� 
+     <li>���<strong>��������</strong>��������������� 
+   </ul>
+    
+   
+  <strong>3.ɾ����Ŀ</strong>
+  <ul>
+    <li>���Ҫɾ������Ŀ��<img src="../../Images/delete.gif" width="18" height="18" />��ť�� 
+    <li>ϵͳ�����ȷ���Ƿ�Ҫɾ�������<strong>ȷ��</strong>����Ŀ��ɾ���� 
+  </ul>
+ 
+  
+  <strong>4.�༭��Ŀ</strong> 
+  <ul>
+    <li>���Ҫ�༭����Ŀ��<img src="../../Images/edit.gif" width="18" height="18" />��ť��</li>
+    <li>��Ŀ��ϸ����ʾ�ڱ༭����</li>
+    <li>�༭��ɺ󣬵��<strong>��������</strong> ��ť����ɶԸ���Ŀ���޸ġ� 
+</ul>
+
+ <hr />
+  <strong>�ر���ʾ�� 
+  <br/>
+  </strong>
+<ul>
+<li>����ͺ��������Ŀ�б����ڸ���<strong>���� </strong>
+��ʾ��
+</li>
+<li> ��Ŀɾ��������Ҳ��һ��ɾ�����������µ���Ŀ��ʹ����һ����������
+</li>
+</ul>
+</body>
+</html>
diff --git a/ug/Project/WorkReport.html b/ug/Project/WorkReport.html
new file mode 100644
index 0000000..65d86f9
--- /dev/null
+++ b/ug/Project/WorkReport.html
@@ -0,0 +1,53 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ���ù����ܽ��ϴ�����ֱ��������Ա�Ĺ����ܽ�鿴��</p>
+<p>��ҳ�����϶��·�Ϊ���鹦������</p>
+    <ul>
+    <li>�����ܽ���ϴ�����ѯ</li>
+    <li>�����ܽ��б�</li>
+    </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.�����ܽ��ϴ�</strong>
+   <ul>
+     <li>ѡ�������IJ��š������ܽ����ͣ�������ϴ��ĵ��ļ�Ҫ˵��</li>
+     <li> ���<strong>���</strong> ��ť��ѡ��Ҫ�ϴ����ļ������<strong>�ϴ�</strong>��ť������ϴ�������<strong><br/>
+     </strong></li>
+   </ul>
+   <strong><br/>
+ 2.�����ܽ��ѯ</strong>
+   <ul>
+      <li>ѡ�������IJ��š������ܽ�����  </li>
+      <li>���<strong>��ѯ</strong>��ť<strong><br/>
+       </strong> </li>
+     <li>��ѯ��������Լ��ϴ��Ĺ����ܽἰ��ѡ���ŵ�ֱ�������Ĺ����ܽᡣ</li>
+</ul>
+ <strong><br/>
+ 3.�����ܽ�༭</strong>
+   <ul>
+      <li>��Ŀ�б��Ҳ�ı༭��λ�������༭��ť�����<img src="../../Images/delete.gif" width="18" height="18" />��ť����ɾ�����ϴ��Ĺ����ܽᣬ�Ҳ�<img src="../../Images/detail.gif" width="18" height="18" />��ť���ڲ鿴�����ܽᡣ </li>
+      </ul>
+   <strong><br/>
+   <br/>
+4.��Ŀ�ϴ�</strong><strong>  <br />
+</strong><br />
+  <ul>
+    <li>����Ŀ�ϴ����򣬵��<strong>���</strong>��ť��ѡ����ϴ���Excel�ļ����ȷ����</li>
+    <li>���<strong>�ϴ���Ŀ</strong>��ť������ϴ�������</li>
+</ul>
+  <br/>
+  <hr />
+  <strong>�ر���ʾ��<br/>
+  <br/></strong><ul>
+    <li>����ɾ����������ֻ����ɾ���Լ��ϴ��Ĺ����ܽᡣ</li>
+</ul>
+</body>
+</html>
diff --git a/ug/desktop.html b/ug/desktop.html
new file mode 100644
index 0000000..e8adb7d
--- /dev/null
+++ b/ug/desktop.html
@@ -0,0 +1,36 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<strong>����˵����<br/><br/></strong>
+
+
+��ҳ�����û���¼ϵͳ�����ҳ�棬���ڼ�����ʾ�͵�¼�û���ص���Ϣ��
+����֮�¹��������֣�
+<ul>
+<li> ϵͳ��ʾ��          ��ϸչʾ�û�����Ŀ�Ϳγ���Ϣ
+<li> ������־���ƻ�      ��ʾ�û��ƶ����¼�ĵ�����Ժ�����Ĺ����ƻ�����־��
+<li>������Ϣ��ϵͳ��Ϣ   ������Ϣ�����ṩ�������޸ĵĹ��ܡ�ϵͳ��Ϣ�ṩ�˵�ǰ���������Ա�б���
+ </ul>
+<hr />
+<strong><br /> ����˵����<br/><br/>
+  </strong> �޸�����
+<ul>
+<li> ���������Ϣ->�޸�����
+<li>����ԭ���롢������
+<li>����޸İ�ť���������������롣
+<li>���ȡ����ť�����������޸ģ�ԭ���뽫������Ч��
+</ul>
+<hr />
+<strong>�ر���ʾ��<br/><br/></strong>
+<ul>
+<li>�޸������ԭ��������ʧЧ������Ӱ�쵱ǰ�Ự�����´ε�¼ʱ��ʹ�����趨�������롣 
+<li>
+ҳ�������Ϊ���������֣����Ϊ�û�Ȩ���б����Ҳ�Ϊ����������ϵͳ��¼������й���ҳ�涼���Ǵ˲��֣�����������ҳ�治���ἰ��
+</ul>
+</body>
+</html>
diff --git a/ug/login.html b/ug/login.html
new file mode 100644
index 0000000..5e9e851
--- /dev/null
+++ b/ug/login.html
@@ -0,0 +1,30 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>
+��ҳ����ϵͳ�ĵ�¼ҳ�棬ϵͳ�����û�����ĵ�¼��Ϣ����֤��ʶ�û����ݵĺϷ��ԣ���֤ͨ���������û���¼ϵͳ�����к���Ȩ����ƥ���ҵ�������</p>
+<hr />
+  <strong>����˵����<br/>
+  <br/>
+  </strong>
+ 
+<li> 
+�����û��������뼰��֤�룬�����¼��ť��
+<li>��֤ͨ��������û�����ҳ�档
+<li>��֤ʧ����
+  ��ʾ�� <strong>�û���¼��Ϣ�������������롱</strong> ��
+<li>���ȡ����ť������ϵͳ��ҳ��
+
+<hr />
+<strong>�ر���ʾ��<br/><br/></strong>
+<li>�û�������֤�벻���ִ�Сд�������ϸ����ִ�Сд��
+<li> ��֤��ͼƬ���������˫��ͼƬ��ϵͳ���漴�����µ���֤�롣
+</body>
+</html>
diff --git a/ug/nohelpdoc.html b/ug/nohelpdoc.html
new file mode 100644
index 0000000..9a99317
--- /dev/null
+++ b/ug/nohelpdoc.html
@@ -0,0 +1,20 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+<style type="text/css">
+<!--
+.STYLE1 {
+	font-size: 36px;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<span class="STYLE1">û���ҵ���Ӧ�İ����ļ���</span>
+</body>
+
+</html>
diff --git a/ug/training/.svn/entries b/ug/training/.svn/entries
new file mode 100644
index 0000000..dcb41e8
--- /dev/null
+++ b/ug/training/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/ug/training
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+LessonView.html
+file
+
+
+
+
+2011-04-01T02:51:11.696127Z
+7660e544ba7aa03c3f2f95d95eb00ec5
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+961
+
+LessonCategory.html
+file
+
+
+
+
+2011-04-01T02:51:11.696127Z
+3afcafed30ddda694abbe1abf15dadcd
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1893
+
+Lesson.html
+file
+
+
+
+
+2011-04-01T02:51:11.711752Z
+279e4a5315bf2909a44f82807f734e3e
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1878
+
+LessonEmp.html
+file
+
+
+
+
+2011-04-01T02:51:11.727377Z
+609986555c202cd2865f0a5f650ca089
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1890
+
diff --git a/ug/training/.svn/text-base/Lesson.html.svn-base b/ug/training/.svn/text-base/Lesson.html.svn-base
new file mode 100644
index 0000000..b9cdf0a
--- /dev/null
+++ b/ug/training/.svn/text-base/Lesson.html.svn-base
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������ѵ�γ̵�ά����</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µĿγ̽����Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ̵ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ̵���ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.�����</strong>
+   <ul>
+      <li>����Ҳ�γ��б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ŀγ���Ϣ���γ����ƣ�ѧ��Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�����γ̽�Ĭ�ϱ����ڵ�ǰ��ѡ�γ�֮�¡�<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.�γ��޸�</strong>
+   <ul>
+      <li>���ÿγ����ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըÿγ���Ϣ��������Ҫ�ı༭������ע��γ����Ʋ���Ϊ�գ��γ�ѧ��Ϊ�Ǹ�����</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�γ�ɾ��</strong>
+   <ul>
+      <li>�����ɾ���γ��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ�
+ </ul>
+</body>
+</html>
diff --git a/ug/training/.svn/text-base/LessonCategory.html.svn-base b/ug/training/.svn/text-base/LessonCategory.html.svn-base
new file mode 100644
index 0000000..064c5d9
--- /dev/null
+++ b/ug/training/.svn/text-base/LessonCategory.html.svn-base
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������ѵ�γ�����ά����</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µ��¼��γ�������Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ����ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ�������ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.�����</strong>
+   <ul>
+      <li>����Ҳ�γ�����б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ŀγ������Ϣ�� ���Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�����γ����Ĭ�ϱ����ڵ�ǰ��ѡ�γ����֮�¡�<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.�γ��޸�</strong>
+   <ul>
+      <li>���ÿγ�������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըÿγ������Ϣ��������Ҫ�ı༭������ע����𲻿�Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�γ�ɾ��</strong>
+   <ul>
+      <li>�����ɾ���γ��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+ </ul>
+</body>
+</html>
diff --git a/ug/training/.svn/text-base/LessonEmp.html.svn-base b/ug/training/.svn/text-base/LessonEmp.html.svn-base
new file mode 100644
index 0000000..05cf91d
--- /dev/null
+++ b/ug/training/.svn/text-base/LessonEmp.html.svn-base
@@ -0,0 +1,55 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڿγ�ѧԱ�ķ��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ��б�</li>
+    <li>��Ա���б�</li>
+    <li>�γ̡���Ա��ϵ��ͼ</li>
+   </ul>
+ <hr />
+ <strong><br/>
+   <br/>
+ 1.ѧԱ����</strong>
+   <ul>
+     <li>���ѡ�������γ�����Ҫ����Ŀγ̽ڵ㣨�����֣�</li>
+     <li>��ѡ/����ѡ��Ա���ڵ�ǰ�ĸ�ѡ�򣬽�ѡ�л�ȡ��ѡ��ѧԱ��</li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+2.<strong>�鿴</strong></strong><strong>�γ̡���Ա ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ�������γ��б��еĿγ̽ڵ㣬<strong>�γ���Ա�嵥</strong> ����ʾ��ӵ�иÿγ̵���Ա�嵥��</li>
+     <li>����Ա���б��е�������ֵ���Ա���ƣ�<strong>��Ա�γ��嵥</strong> ����ʾ����Ա�Ŀγ��б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+3.<strong>�༭ѧԱ�Ŀγ�ͨ�����</strong>
+<ul>
+     <li>��<strong>�γ���Ա�嵥</strong>����Զ�ѧԱ�ijɼ����б༭
+       <ul>
+         <li>���<img src="../../Images/edit.gif" width="18" height="18" /></li>
+         <li>��ѡ/����ѡ<strong>���</strong>��λ�ĸ�ѡ�� �趨ѧԱ���/δ��ɸÿγ�</li>
+         <li>���<img src="../../Images/save.gif" width="16" height="16" />�����޸ģ����<img src="../../Images/undo.gif" width="16" height="16" />�����޸ġ�</li>
+       </ul>
+       <br/>
+       <strong><br/>
+     </strong></li>
+     </ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+   <li>�������ij�γ̵�ѧԱ�����������ڸÿγ̵�ѧԱ�嵥�ｫ��ѧԱ�Ƴ���
+ </ul>
+</body>
+</html>
diff --git a/ug/training/.svn/text-base/LessonView.html.svn-base b/ug/training/.svn/text-base/LessonView.html.svn-base
new file mode 100644
index 0000000..5e1be4c
--- /dev/null
+++ b/ug/training/.svn/text-base/LessonView.html.svn-base
@@ -0,0 +1,33 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������γ��б���</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�γ��б�����ϸ����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µĿγ̽����Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ̵ı༭��λ<img src="../../Images/detail.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ̵���ϸ��Ϣ��<strong><br/>
+     </strong></li>
+   </ul>
+<hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��
+ </ul>
+</body>
+</html>
diff --git a/ug/training/Lesson.html b/ug/training/Lesson.html
new file mode 100644
index 0000000..b9cdf0a
--- /dev/null
+++ b/ug/training/Lesson.html
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������ѵ�γ̵�ά����</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µĿγ̽����Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ̵ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ̵���ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.�����</strong>
+   <ul>
+      <li>����Ҳ�γ��б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ŀγ���Ϣ���γ����ƣ�ѧ��Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�����γ̽�Ĭ�ϱ����ڵ�ǰ��ѡ�γ�֮�¡�<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.�γ��޸�</strong>
+   <ul>
+      <li>���ÿγ����ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըÿγ���Ϣ��������Ҫ�ı༭������ע��γ����Ʋ���Ϊ�գ��γ�ѧ��Ϊ�Ǹ�����</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�γ�ɾ��</strong>
+   <ul>
+      <li>�����ɾ���γ��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ�
+ </ul>
+</body>
+</html>
diff --git a/ug/training/LessonCategory.html b/ug/training/LessonCategory.html
new file mode 100644
index 0000000..064c5d9
--- /dev/null
+++ b/ug/training/LessonCategory.html
@@ -0,0 +1,60 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������ѵ�γ�����ά����</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�༭����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µ��¼��γ�������Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ����ı༭��λ<img src="../../Images/edit.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ�������ϸ��Ϣ��</li>
+     <li><br/>
+     </li>
+   </ul>
+   <strong><br/>
+2.�����</strong>
+   <ul>
+      <li>����Ҳ�γ�����б��µ�<strong> ������¼</strong> ��ť��</li>
+      <li>�����Ҫ�������Ŀγ������Ϣ�� ���Ϊ�����</li>
+      <li>��� <strong>��������</strong> ��ť��</li>
+      <li>�����γ����Ĭ�ϱ����ڵ�ǰ��ѡ�γ����֮�¡�<strong><br/>
+      </strong> </li>
+</ul>
+
+<strong><br/>
+2.�γ��޸�</strong>
+   <ul>
+      <li>���ÿγ�������ڱ༭״̬</li>
+      <li>�ڱ༭�������Ըÿγ������Ϣ��������Ҫ�ı༭������ע����𲻿�Ϊ�ա�</li>
+      <li>��� <strong>��������</strong> ��ť��<strong><br/>
+     </strong></li>
+   </ul>
+
+<strong><br/>
+2.�γ�ɾ��</strong>
+   <ul>
+      <li>�����ɾ���γ��Ҳ�༭��λ��<img src="../../Images/delete.gif" width="18" height="18" />��ť��</li>
+      <li>ϵͳ������ȷ���Ƿ�ɾ���ĶԻ���������ȷ��ɾ���������ɾ��������<strong><br/>
+      </strong></li>
+   </ul>
+ <hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��ɾ������һ��Ҫ���أ�������ɾ���ݡ���
+ </ul>
+</body>
+</html>
diff --git a/ug/training/LessonEmp.html b/ug/training/LessonEmp.html
new file mode 100644
index 0000000..05cf91d
--- /dev/null
+++ b/ug/training/LessonEmp.html
@@ -0,0 +1,55 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ�����ڿγ�ѧԱ�ķ��䡣</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ��б�</li>
+    <li>��Ա���б�</li>
+    <li>�γ̡���Ա��ϵ��ͼ</li>
+   </ul>
+ <hr />
+ <strong><br/>
+   <br/>
+ 1.ѧԱ����</strong>
+   <ul>
+     <li>���ѡ�������γ�����Ҫ����Ŀγ̽ڵ㣨�����֣�</li>
+     <li>��ѡ/����ѡ��Ա���ڵ�ǰ�ĸ�ѡ�򣬽�ѡ�л�ȡ��ѡ��ѧԱ��</li>
+     <li>���<strong>��������</strong> ��ť�������������޸ġ�<br/>
+       <strong><br/>
+       </strong></li>
+   </ul>
+2.<strong>�鿴</strong></strong><strong>�γ̡���Ա ��ϵ��ͼ </strong>
+   <ul>
+     <li>���ѡ�������γ��б��еĿγ̽ڵ㣬<strong>�γ���Ա�嵥</strong> ����ʾ��ӵ�иÿγ̵���Ա�嵥��</li>
+     <li>����Ա���б��е�������ֵ���Ա���ƣ�<strong>��Ա�γ��嵥</strong> ����ʾ����Ա�Ŀγ��б���<br/>
+       <strong><br/>
+     </strong></li>
+</ul>
+3.<strong>�༭ѧԱ�Ŀγ�ͨ�����</strong>
+<ul>
+     <li>��<strong>�γ���Ա�嵥</strong>����Զ�ѧԱ�ijɼ����б༭
+       <ul>
+         <li>���<img src="../../Images/edit.gif" width="18" height="18" /></li>
+         <li>��ѡ/����ѡ<strong>���</strong>��λ�ĸ�ѡ�� �趨ѧԱ���/δ��ɸÿγ�</li>
+         <li>���<img src="../../Images/save.gif" width="16" height="16" />�����޸ģ����<img src="../../Images/undo.gif" width="16" height="16" />�����޸ġ�</li>
+       </ul>
+       <br/>
+       <strong><br/>
+     </strong></li>
+     </ul>
+   <hr />
+<strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+   <li>�������ij�γ̵�ѧԱ�����������ڸÿγ̵�ѧԱ�嵥�ｫ��ѧԱ�Ƴ���
+ </ul>
+</body>
+</html>
diff --git a/ug/training/LessonView.html b/ug/training/LessonView.html
new file mode 100644
index 0000000..5e1be4c
--- /dev/null
+++ b/ug/training/LessonView.html
@@ -0,0 +1,33 @@
+<!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>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<title>ϵͳ����</title>
+</head>
+
+<body>
+<p><strong>����˵����<br/>
+  <br/>
+</strong>��ҳ����������γ��б���</p>
+<p>��ҳ��������ҷ�Ϊ���鹦������</p>
+    <ul>
+    <li>�γ������״ͼ </li>
+    <li>�γ��б�����ϸ����</li>
+   </ul>
+   <hr />
+ <strong>����˵����</strong><strong><br/><br/>
+ 1.����</strong>
+   <ul>
+     <li>������γ������������ڵ㣬�ýڵ��µĿγ̽����Ҳ��б���ʾ��</li>
+     <li>����Ҳ�����γ̵ı༭��λ<img src="../../Images/detail.gif" width="18" height="18" />��ť�� </strong> </li>
+     <li>�����Ҳ�γ��б���չʾ�ÿγ̵���ϸ��Ϣ��<strong><br/>
+     </strong></li>
+   </ul>
+<hr />
+  <strong>�ر���ʾ��<br/></strong>
+ <ul>
+  
+<li>��
+ </ul>
+</body>
+</html>
diff --git a/upload/.svn/entries b/upload/.svn/entries
new file mode 100644
index 0000000..18480af
--- /dev/null
+++ b/upload/.svn/entries
@@ -0,0 +1,99 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/upload
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
+fileUpload.aspx.cs
+file
+
+
+
+
+2011-04-01T02:51:01.430436Z
+35013f8b22e2207ba2aa9ae45c149c85
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3543
+
+projects
+dir
+
+fileUpload.aspx
+file
+
+
+
+
+2011-04-01T02:51:01.430436Z
+27868df699c4201e78fd79558f5db0d8
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3154
+
diff --git a/upload/.svn/text-base/fileUpload.aspx.cs.svn-base b/upload/.svn/text-base/fileUpload.aspx.cs.svn-base
new file mode 100644
index 0000000..23269c1
--- /dev/null
+++ b/upload/.svn/text-base/fileUpload.aspx.cs.svn-base
@@ -0,0 +1,101 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using ZhangPu.Gov.Logical;
+
+public partial class upload_fileUpload : PagePublic
+{
+    private string fileType ="";
+    private string fileCode = "";
+    private string fileInfo = "";
+    private string empid="";
+    protected void Page_Load(object sender, EventArgs e)
+    { 
+       
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        getParameters();
+        try
+        {
+        if (fileUpload1.FileName.Length == 0) return;
+        lbuploadmessage.Text = "";
+        string fileName = fileUpload1.FileName;
+            
+        System.Random rand = new Random();
+        int len = rand.Next();
+        fileName = empid + "T" + fileType + len +
+                   fileName.Substring(fileName.LastIndexOf("."));
+        DirectoryInfo dir = new DirectoryInfo(Server.MapPath("~/upload/"+fileType ));
+        if (!dir.Exists)
+            dir.Create();
+        string fileSavePath = Server.MapPath("~/upload/" + fileType+"/" + fileName);
+        fileUpload1.SaveAs(fileSavePath); 
+        lbuploadmessage.Text = "上传成功！"; 
+      
+        LFile _logic = new LFile();
+            _logic.Initialize();
+            _logic.GetFilesmgrExt.File_type = Convert.ToInt32(fileType);
+            _logic.GetFilesmgrExt.file_dest = fileName;
+            _logic.GetFilesmgrExt.File_Desc = txtFileDesc.Text;
+            _logic.GetFilesmgrExt.File_Emp = Convert.ToInt32(empid); 　
+            if (fileType.Equals(((int)Tracen.Utils.FileType.Project).ToString()))
+                _logic.GetFilesmgrExt.File_Project = Convert.ToInt32(fileInfo);
+            if (fileType.Equals(((int)Tracen.Utils.FileType.ProjectDetail).ToString()))
+                _logic.GetFilesmgrExt.File_ProjectDetail = Convert.ToInt32(fileInfo);
+            _logic.GetFilesmgrExt.Add();
+
+            closewindow();
+
+        }
+        catch (Exception er)
+        {
+
+            lbuploadmessage.Text = "上传失败！"; 
+        } 
+    }
+
+    void closewindow()
+    { 
+        StringBuilder strResponse = new StringBuilder();
+        strResponse.Append("<script language=JavaScript>");
+      //  strResponse.Append("alert('aaa');");
+        strResponse.Append("this.close();");
+        strResponse.Append(" </");
+        strResponse.Append("script>");
+        Response.Write(strResponse);
+    }
+    void getParameters()
+    {
+
+     //   if (Session["uploadCode"] != null && Session["fileType"] != null && Session["fileInfo"] != null)
+     //   if (Session["uploadCode"] != null && Session["fileType"] != null && Session["fileInfo"] != null)
+     //    {
+     //       string preCode = Session["uploadCode"].ToString();
+            fileCode = Request.QueryString["fileCode"];
+            fileType = Request.QueryString["fileType"];
+            fileInfo = Request.QueryString["fileInfo"];
+            empid = Request.QueryString["id"];
+           // fileType = Session["fileType"].ToString();
+          //  fileInfo = Session["fileInfo"].ToString();
+        //    if (!fileCode.Equals(preCode))
+       //     {
+      //          closewindow();
+      //      }
+     //   }
+    //    else
+     //   {
+      //      closewindow();
+     //   }
+    }
+}
diff --git a/upload/.svn/text-base/fileUpload.aspx.svn-base b/upload/.svn/text-base/fileUpload.aspx.svn-base
new file mode 100644
index 0000000..1ee5a2b
--- /dev/null
+++ b/upload/.svn/text-base/fileUpload.aspx.svn-base
@@ -0,0 +1,57 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="fileUpload.aspx.cs" Inherits="upload_fileUpload" %>
+
+<!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 runat="server">
+    <title>上传文件</title>
+     <link href="../ZhangPuStyle.css" type="text/css" rel="stylesheet" />
+     <base  target=_self> 
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+        <br />
+        <br />
+        <table align="center">
+                                <tr>
+                                    <td>
+                                        <asp:Label ID="Label51" runat="server" CssClass="Label" Text="上传文件"></asp:Label></td>
+                                    <td align="left">
+                                        <asp:FileUpload ID="fileUpload1" runat="server" Width="401px" /></td>
+                                    <td>
+                                        &nbsp;</td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                                 <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label6" runat="server" CssClass="Label" Text="附件说明"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtFileDesc" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtFileDesc"
+                                                            ErrorMessage="*">＊</asp:RequiredFieldValidator>
+                                                        <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="上传" OnClick="btnSubmit_Click" /></td>
+                                                    <td align="left">
+                                                    </td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td align="left">
+                                        <asp:Label ID="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+                                    <td align="left">
+                                    </td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                            </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/upload/fileUpload.aspx b/upload/fileUpload.aspx
new file mode 100644
index 0000000..1ee5a2b
--- /dev/null
+++ b/upload/fileUpload.aspx
@@ -0,0 +1,57 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="fileUpload.aspx.cs" Inherits="upload_fileUpload" %>
+
+<!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 runat="server">
+    <title>上传文件</title>
+     <link href="../ZhangPuStyle.css" type="text/css" rel="stylesheet" />
+     <base  target=_self> 
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+        <br />
+        <br />
+        <table align="center">
+                                <tr>
+                                    <td>
+                                        <asp:Label ID="Label51" runat="server" CssClass="Label" Text="上传文件"></asp:Label></td>
+                                    <td align="left">
+                                        <asp:FileUpload ID="fileUpload1" runat="server" Width="401px" /></td>
+                                    <td>
+                                        &nbsp;</td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                                 <tr>
+                                                    <td>
+                                                        <asp:Label ID="Label6" runat="server" CssClass="Label" Text="附件说明"></asp:Label></td>
+                                                    <td align="left">
+                                                        <asp:TextBox ID="txtFileDesc" runat="server" CssClass="TextBox" MaxLength="25">
+                                                        </asp:TextBox>
+                                                        <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ControlToValidate="txtFileDesc"
+                                                            ErrorMessage="*">＊</asp:RequiredFieldValidator>
+                                                        <asp:Button ID="btnFileUpload" runat="server" CssClass="Button" Text="上传" OnClick="btnSubmit_Click" /></td>
+                                                    <td align="left">
+                                                    </td>
+                                                    <td>
+                                                        &nbsp;</td>
+                                                </tr>
+                                <tr>
+                                    <td>
+                                    </td>
+                                    <td align="left">
+                                        <asp:Label ID="lbuploadmessage" runat="server" CssClass="Label"></asp:Label></td>
+                                    <td align="left">
+                                    </td>
+                                    <td>
+                                        &nbsp;
+                                    </td>
+                                </tr>
+                            </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/upload/fileUpload.aspx.cs b/upload/fileUpload.aspx.cs
new file mode 100644
index 0000000..4cb1086
--- /dev/null
+++ b/upload/fileUpload.aspx.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Text;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using DeiNiu.wms.Logical;
+
+public partial class upload_fileUpload : PagePublic
+{
+    private string fileType ="";
+    private string fileCode = "";
+    private string fileInfo = "";
+    private string empid="";
+    protected void Page_Load(object sender, EventArgs e)
+    { 
+       
+    }
+
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+        getParameters();
+        try
+        {
+        if (fileUpload1.FileName.Length == 0) return;
+        lbuploadmessage.Text = "";
+        string fileName = fileUpload1.FileName;
+            
+        System.Random rand = new Random();
+        int len = rand.Next();
+        fileName = empid + "T" + fileType + len +
+                   fileName.Substring(fileName.LastIndexOf("."));
+        DirectoryInfo dir = new DirectoryInfo(Server.MapPath("~/upload/"+fileType ));
+        if (!dir.Exists)
+            dir.Create();
+        string fileSavePath = Server.MapPath("~/upload/" + fileType+"/" + fileName);
+        fileUpload1.SaveAs(fileSavePath); 
+        lbuploadmessage.Text = "上传成功！"; 
+      
+        LFile _logic = new LFile();
+            _logic.Initialize();
+            _logic.GetFilesmgr.File_type = Convert.ToInt32(fileType);
+            _logic.GetFilesmgr.file_dest = fileName;
+            _logic.GetFilesmgr.File_Desc = txtFileDesc.Text;
+            _logic.GetFilesmgr.File_Emp = Convert.ToInt32(empid); 　
+            if (fileType.Equals(((int)DeiNiu.Utils.FileType.Project).ToString()))
+                _logic.GetFilesmgr.File_Project = Convert.ToInt32(fileInfo);
+            if (fileType.Equals(((int)DeiNiu.Utils.FileType.ProjectDetail).ToString()))
+                _logic.GetFilesmgr.File_ProjectDetail = Convert.ToInt32(fileInfo);
+            _logic.GetFilesmgr.Add();
+
+            closewindow();
+
+        }
+        catch (Exception er)
+        {
+
+            lbuploadmessage.Text = "上传失败！"; 
+        } 
+    }
+
+    void closewindow()
+    { 
+        StringBuilder strResponse = new StringBuilder();
+        strResponse.Append("<script language=JavaScript>");
+      //  strResponse.Append("alert('aaa');");
+        strResponse.Append("this.close();");
+        strResponse.Append(" </");
+        strResponse.Append("script>");
+        Response.Write(strResponse);
+    }
+    void getParameters()
+    {
+
+     //   if (Session["uploadCode"] != null && Session["fileType"] != null && Session["fileInfo"] != null)
+     //   if (Session["uploadCode"] != null && Session["fileType"] != null && Session["fileInfo"] != null)
+     //    {
+     //       string preCode = Session["uploadCode"].ToString();
+            fileCode = Request.QueryString["fileCode"];
+            fileType = Request.QueryString["fileType"];
+            fileInfo = Request.QueryString["fileInfo"];
+            empid = Request.QueryString["id"];
+           // fileType = Session["fileType"].ToString();
+          //  fileInfo = Session["fileInfo"].ToString();
+        //    if (!fileCode.Equals(preCode))
+       //     {
+      //          closewindow();
+      //      }
+     //   }
+    //    else
+     //   {
+      //      closewindow();
+     //   }
+    }
+}
diff --git a/upload/projects/.svn/entries b/upload/projects/.svn/entries
new file mode 100644
index 0000000..7ee6b97
--- /dev/null
+++ b/upload/projects/.svn/entries
@@ -0,0 +1,28 @@
+10
+
+dir
+8
+file:///D:/Repositories/ZhangPu/trunk/view/upload/projects
+file:///D:/Repositories/ZhangPu
+
+
+
+2011-03-31T02:53:16.230701Z
+2
+mwang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+69712cd5-45d9-e244-acd6-b3e9c1159652
+
diff --git a/wms/Charts - 副本 (2).aspx.exclude b/wms/Charts - 副本 (2).aspx.exclude
new file mode 100644
index 0000000..3da484a
--- /dev/null
+++ b/wms/Charts - 副本 (2).aspx.exclude	
@@ -0,0 +1,577 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:100%;height:100%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+    
+        <script type="text/javascript" language="javascript">
+	<!-- #include file="../public/JScript.js" -->
+        </script>
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="95%" height="100%"  align="center"   >
+  
+    <tr>
+  <td/><td/>
+    <td align="center"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;"     />
+     </td>
+    <td></td><td/>
+    </tr>
+
+     <tr><td colspan="5" align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+              辣得叫库房任务看板   
+          </td></tr>
+     <tr><td colspan="5"></p> </p>  </td></tr>
+    <tr>
+    <td/>
+    <td  >
+    
+    
+        &nbsp;</td>
+    
+    <td align="center">
+  
+     <table  Height="800px" Width="auto" ><tr>
+     
+     <td>
+
+      <table  Height="800px" Width="auto" >
+      <tr> 
+      <td> 
+
+          <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+              Width="320px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="出库订单" 
+                                      TextColor="255, 255, 255" />
+                              </Titles>
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" 
+                              Position="Inside" TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+      </td> 
+      <td>
+
+          <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+              Width="320px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="入库订单" 
+                                      TextColor="255, 255, 255" />
+                              </Titles>
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" 
+                              Position="Inside" TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+      </td>
+       </tr>
+
+      <tr> <td colspan="2">  
+          <dx:WebChartControl ID="WebChartControl1" runat="server" 
+              CrosshairEnabled="True" Height="400px" Width="640px" BackColor="#000000">
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <AxisX Visibility="True" VisibleInPanesSerializable="-1">
+                          <Label Font="黑体, 10pt" TextColor="255, 255, 255">
+                          </Label>
+                      </AxisX>
+                      <AxisY Visibility="False" VisibleInPanesSerializable="-1">
+                      </AxisY>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 14pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 14pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="255, 255, 0" Kind="Diamond" Size="18">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 10pt, style=Bold" 
+                              TextColor="255, 255, 255" TextPattern="{V}">
+                              <Border Color="255, 255, 255" Thickness="4" Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="240, 0, 0">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 10pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+          </td> </tr>
+
+      </table>
+     
+     </td>
+     
+     <td> 
+      
+         <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+             AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+             CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+             Width="400px">
+             <BorderOptions Visibility="False" />
+             <DiagramSerializable>
+                 <dx:XYDiagram Rotated="True">
+                     <axisx Color="Black" InterlacedColor="0, 0, 0" Title-Text="" 
+                         Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                         <InterlacedFillStyle FillMode="Solid">
+                         </InterlacedFillStyle>
+                         <Tickmarks MinorVisible="False" Visible="False" />
+                         <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                         </Label>
+                     </axisx>
+                     <axisy Visibility="False" visibleinpanesserializable="-1">
+                     </axisy>
+                     <DefaultPane BackColor="0, 0, 0" Weight="2">
+                         <FillStyle FillMode="Solid">
+                         </FillStyle>
+                         <Shadow Color="Black" />
+                     </DefaultPane>
+                 </dx:XYDiagram>
+             </DiagramSerializable>
+             <Legend Name="Default Legend" Visibility="False"></Legend>
+             <SeriesSerializable>
+                 <dx:Series LabelsVisibility="True" Name="完成数">
+                     <Points>
+                         <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                         </dx:SeriesPoint>
+                     </Points>
+                     <viewserializable>
+                         <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                             <Border Color="240, 0, 0" Visibility="True" />
+                             <FillStyle FillMode="Gradient">
+                                 <OptionsSerializable>
+                                     <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                 </OptionsSerializable>
+                             </FillStyle>
+                         </dx:StackedBarSeriesView>
+                     </viewserializable>
+                     <LabelSerializable>
+                         <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                         </dx:StackedBarSeriesLabel>
+                     </LabelSerializable>
+                 </dx:Series>
+                 <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                     Visible="False">
+                     <Points>
+                         <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                         </dx:SeriesPoint>
+                         <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                         </dx:SeriesPoint>
+                     </Points>
+                     <ViewSerializable>
+                         <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                             <FillStyle FillMode="Hatch">
+                                 <OptionsSerializable>
+                                     <dx:HatchFillOptions Color2="Black" />
+                                 </OptionsSerializable>
+                             </FillStyle>
+                         </dx:SideBySideStackedBarSeriesView>
+                     </ViewSerializable>
+                     <LabelSerializable>
+                         <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 12pt, style=Bold" 
+                             Indent="1" Position="TopInside" TextColor="White">
+                         </dx:StackedBarSeriesLabel>
+                     </LabelSerializable>
+                 </dx:Series>
+             </SeriesSerializable>
+             <SeriesTemplate>
+                 <ViewSerializable>
+                     <dx:StackedBarSeriesView>
+                     </dx:StackedBarSeriesView>
+                 </ViewSerializable>
+             </SeriesTemplate>
+             <Titles>
+                 <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                     TextColor="255, 255, 255" Visibility="True" />
+             </Titles>
+         </dx:WebChartControl>
+        </td><td> 
+    
+        <dx:WebChartControl ID="WebChartTasks" runat="server" 
+            CrosshairEnabled="True" Height="400px" Width="480px" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                PaletteName="Pastel Kit">
+            <BorderOptions Visibility="False" />
+            <DiagramSerializable>
+                <dx:XYDiagram>
+                    <axisx visibleinpanesserializable="-1" Title-Text="" Visibility="True" 
+                        Color="Black" InterlacedColor="0, 0, 0" Title-Visibility="True">
+                        <InterlacedFillStyle FillMode="Solid">
+                        </InterlacedFillStyle>
+                        <Tickmarks MinorVisible="False" Visible="False" />
+                        <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                        </Label>
+                    </axisx>
+                    <axisy visibleinpanesserializable="-1" Visibility="False">
+                    </axisy>
+                    <DefaultPane BackColor="0, 0, 0" Weight="2">
+                        <FillStyle FillMode="Solid">
+                        </FillStyle>
+                        <Shadow Color="Black" />
+                    </DefaultPane>
+                </dx:XYDiagram>
+            </DiagramSerializable>
+            <Legend Name="Default Legend" Visibility="False"></Legend>
+            <SeriesSerializable>
+                <dx:Series Name="任务数" LabelsVisibility="True" ShowInLegend="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <viewserializable>
+                        <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                            <FillStyle FillMode="Hatch">
+                                <OptionsSerializable>
+                                    <dx:HatchFillOptions Color2="0, 0, 0" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:SideBySideStackedBarSeriesView>
+                    </viewserializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 12pt, style=Bold" Indent="1" 
+                            Position="TopInside" BackColor="0, 0, 0" TextColor="255, 255, 255">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series LabelsVisibility="True" Name="完成数">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                            <Border Color="240, 0, 0" Visibility="True" />
+                            <FillStyle FillMode="Gradient">
+                                <OptionsSerializable>
+                                    <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+            <SeriesTemplate>
+                <ViewSerializable>
+                    <dx:StackedBarSeriesView>
+                    </dx:StackedBarSeriesView>
+                </ViewSerializable>
+            </SeriesTemplate>
+            <Titles>
+                <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                    TextColor="255, 255, 255" Visibility="True" />
+            </Titles>
+        </dx:WebChartControl>
+        </td><td>  
+    
+       <dx:WebChartControl ID="WebChartLocs" runat="server" 
+            CrosshairEnabled="True" Height="400px" Width="320px" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                PaletteName="Pastel Kit">
+            <BorderOptions Visibility="False" />
+            <DiagramSerializable>
+                <dx:XYDiagram>
+                    <axisx visibleinpanesserializable="-1" Title-Text="" Visibility="True" 
+                        Color="Black" InterlacedColor="0, 0, 0" Title-Visibility="True">
+                        <InterlacedFillStyle FillMode="Solid">
+                        </InterlacedFillStyle>
+                        <Tickmarks MinorVisible="False" Visible="False" />
+                        <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                        </Label>
+                    </axisx>
+                    <axisy visibleinpanesserializable="-1" Visibility="False">
+                    </axisy>
+                    <DefaultPane BackColor="0, 0, 0" Weight="2">
+                        <FillStyle FillMode="Solid">
+                        </FillStyle>
+                        <Shadow Color="Black" />
+                    </DefaultPane>
+                </dx:XYDiagram>
+            </DiagramSerializable>
+            <Legend Name="Default Legend" Visibility="False"></Legend>
+            <SeriesSerializable>
+                <dx:Series Name="任务数" LabelsVisibility="True" ShowInLegend="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <viewserializable>
+                        <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                            <FillStyle FillMode="Hatch">
+                                <OptionsSerializable>
+                                    <dx:HatchFillOptions Color2="0, 0, 0" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:SideBySideStackedBarSeriesView>
+                    </viewserializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 12pt, style=Bold" Indent="1" 
+                            Position="TopInside" BackColor="0, 0, 0" TextColor="255, 255, 255">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series LabelsVisibility="True" Name="完成数">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                            <Border Color="240, 0, 0" Visibility="True" />
+                            <FillStyle FillMode="Gradient">
+                                <OptionsSerializable>
+                                    <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+            <SeriesTemplate>
+                <ViewSerializable>
+                    <dx:StackedBarSeriesView>
+                    </dx:StackedBarSeriesView>
+                </ViewSerializable>
+            </SeriesTemplate>
+            <Titles>
+                  <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                    TextColor="255, 255, 255" Visibility="True" />
+            </Titles>
+        </dx:WebChartControl>
+
+        </td></tr>
+       </table>
+    </td>
+
+        <td>
+    
+    
+     
+    
+     
+    
+    </td>
+   <td/>
+
+    </tr>
+      <tr>
+            <td align="center" colspan=5>
+               
+                 
+            </td>
+        </tr>
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/Charts - 副本 (3).aspx.exclude b/wms/Charts - 副本 (3).aspx.exclude
new file mode 100644
index 0000000..909f848
--- /dev/null
+++ b/wms/Charts - 副本 (3).aspx.exclude	
@@ -0,0 +1,652 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:100%;height:100%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+    
+        <script type="text/javascript" language="javascript">
+	<!-- #include file="../public/JScript.js" -->
+        </script>
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="95%" height="100%"  align="center"   >
+  
+    <tr>
+  <td/><td/>
+    <td align="left"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:left;"     />
+     </td>
+    <td></td><td/>
+    </tr>
+
+     <tr><td colspan="5" align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+             辣得叫库房任务看板 
+             <br />
+             <br />
+          </td></tr>
+     <tr><td colspan="5"></p> </p>  </td></tr>
+    <tr>
+    <td/>
+    <td  >
+    
+    
+        &nbsp;</td>
+    
+    <td align="center">
+  
+     <table  Height="800px" Width="auto" ><tr>
+     
+     <td>
+
+      <table  Height="800px" Width="auto" >  
+      
+         <tr> <td  >  
+          <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" Width="300px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:PieSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="入库单据" TextColor="White" />
+                              </Titles>
+                          </dx:PieSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PieSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" Position="Inside" 
+                              TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:PieSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+          </td><td>
+          <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" Width="300px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:PieSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="出库单据" TextColor="White" />
+                              </Titles>
+                          </dx:PieSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PieSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" Position="Inside" 
+                              TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:PieSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+          </td> </tr>
+      <tr> 
+      <td colspan ="2">           
+
+          <dx:WebChartControl ID="WebChartInOutLine" runat="server" BackColor="Black" 
+              CrosshairEnabled="True" Height="300px" Width="600px">
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <axisx Visibility="True" visibleinpanesserializable="-1" Color="255, 255, 255" 
+                          InterlacedColor="255, 255, 255" Title-Font="黑体, 12pt, style=Bold" 
+                          Title-Text="订单七日趋势" Title-TextColor="255, 255, 255" 
+                          Title-Visibility="Default">
+                          <Tickmarks MinorVisible="False" />
+                          <Label Font="黑体, 10pt" TextColor="255, 255, 255">
+                          </Label>
+                      </axisx>
+                      <axisy Visibility="False" visibleinpanesserializable="-1">
+                      </axisy>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 14pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255" AlignmentVertical="Center">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 14pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18" Color="255, 255, 0" Kind="Diamond">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 10pt, style=Bold" BackColor="Black" 
+                              TextColor="White" TextPattern="{V}">
+                              <Border Visibility="False" Color="White" Thickness="4" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <viewserializable>
+                          <dx:LineSeriesView Color="240, 0, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="240, 0, 0" Size="12">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </viewserializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 10pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+          </td>
+       </tr> 
+      </table>
+     
+     </td>
+     
+     <td> 
+      
+         &nbsp;</td><td align="center" nowrap="nowrap" valign="middle"> 
+    
+            <table>
+          
+          <tr><td> 
+              <dx:WebChartControl ID="WebChartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="480px" PaletteName="Pastel Kit" 
+                  Width="800px">
+                  <BorderOptions Visibility="False" Color="255, 255, 255" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="111111" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="分类任务" TextColor="255, 255, 255" 
+                          Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 12pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+              <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+                  Width="800px">
+                  <BorderOptions Visibility="False" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="0, 0, 0" Font="黑体, 16pt, style=Bold" MarkerVisible="False" 
+                      TextColor="255, 255, 255" TextVisible="False">
+                      <Border Visibility="False" />
+                      <Title Font="黑体, 16pt, style=Bold" Text="今日绩效" Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                          Visible="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="Black" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 12pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="White">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+              </td></tr>
+            </table>
+
+
+        </td>
+        <td>  
+
+        <table>
+        <tr><td>
+            <dx:WebChartControl ID="WebChartStatePie" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+                Width="320px">
+                <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                    <Border Visibility="False" />
+                </Legend>
+                <SeriesSerializable>
+                    <dx:Series Name="Series 1">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:NestedDoughnutSeriesView>
+                                <Titles>
+                                    <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="任务汇总" TextColor="White" />
+                                </Titles>
+                            </dx:NestedDoughnutSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:NestedDoughnutSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" 
+                                TextPattern="{A}{V}">
+                                <Border Visibility="True" />
+                            </dx:NestedDoughnutSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+            </dx:WebChartControl>
+            </td></tr>
+        <tr><td> 
+            <dx:WebChartControl ID="WebChartLocs" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+                Width="320px">
+                <BorderOptions Visibility="False" />
+                <DiagramSerializable>
+                    <dx:XYDiagram>
+                        <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                            Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                            <InterlacedFillStyle FillMode="Solid">
+                            </InterlacedFillStyle>
+                            <Tickmarks MinorVisible="False" />
+                            <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                            </Label>
+                        </axisx>
+                        <axisy Visibility="False" visibleinpanesserializable="-1">
+                            <Tickmarks MinorVisible="False" Visible="False" />
+                            <Label Visible="False">
+                            </Label>
+                            <GridLines Visible="False">
+                            </GridLines>
+                        </axisy>
+                        <DefaultPane BackColor="0, 0, 0" Weight="2">
+                            <FillStyle FillMode="Solid">
+                            </FillStyle>
+                            <Shadow Color="Black" />
+                        </DefaultPane>
+                    </dx:XYDiagram>
+                </DiagramSerializable>
+                <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                    BackColor="Black" MarkerVisible="False" TextVisible="False">
+                    <Border Visibility="False" />
+                    <Title Font="黑体, 16pt, style=Bold" Text="库位使用" TextColor="255, 255, 255" 
+                        Visible="True"></Title></Legend>
+                <SeriesSerializable>
+                    <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <viewserializable>
+                            <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                <FillStyle FillMode="Hatch">
+                                    <OptionsSerializable>
+                                        <dx:HatchFillOptions Color2="0, 0, 0" />
+                                    </OptionsSerializable>
+                                </FillStyle>
+                            </dx:SideBySideStackedBarSeriesView>
+                        </viewserializable>
+                        <LabelSerializable>
+                            <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 12pt, style=Bold" 
+                                Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                            </dx:StackedBarSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                    <dx:Series LabelsVisibility="True" Name="完成数">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                <Border Color="240, 0, 0" Visibility="False" />
+                                <FillStyle FillMode="Gradient">
+                                    <OptionsSerializable>
+                                        <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                    </OptionsSerializable>
+                                </FillStyle>
+                            </dx:StackedBarSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                            </dx:StackedBarSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+                <SeriesTemplate>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                </SeriesTemplate>
+                <Titles>
+                    <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                        TextColor="255, 255, 255" Visibility="False" />
+                </Titles>
+            </dx:WebChartControl>
+            </td></tr>
+        </table>
+    
+             
+         </td>
+         
+         </tr>
+       </table>
+    </td>
+
+        <td>
+    
+    
+     
+    
+     
+    
+    </td>
+   <td/>
+
+    </tr>
+      <tr>
+            <td align="center" colspan=5>
+               
+                 
+            </td>
+        </tr>
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/Charts - 副本 (4).aspx.exclude b/wms/Charts - 副本 (4).aspx.exclude
new file mode 100644
index 0000000..a50e432
--- /dev/null
+++ b/wms/Charts - 副本 (4).aspx.exclude	
@@ -0,0 +1,727 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:100%;height:100%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+    
+        <script type="text/javascript" language="javascript">
+	<!-- #include file="../public/JScript.js" -->
+        </script>
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="95%" height="100%"  align="center"   >
+  
+    <tr>
+  <td/><td/>
+    <td align="left"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:left;"     />
+     </td>
+    <td></td><td/>
+    </tr>
+
+     <tr><td colspan="5" align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+             辣得叫库房任务看板 
+             <br />
+             <br />
+          </td></tr>
+     <tr><td colspan="5"></p> </p>  </td></tr>
+    <tr>
+    <td/>
+    <td  >
+    
+    
+        <dx:WebChartControl ID="WebChartErpOrders" runat="server" 
+            AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+            CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" Visible="False" 
+            Width="320px">
+            <Legend AlignmentHorizontal="Center" AlignmentVertical="TopOutside" 
+                Direction="LeftToRight" MarkerSize="20, 22" Name="Default Legend" 
+                Visibility="True">
+                <Border Visibility="False" />
+            </Legend>
+            <SeriesSerializable>
+                <dx:Series LabelsVisibility="True" Name="入库单">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:NestedDoughnutSeriesView InnerIndent="7.1">
+                            <Titles>
+                                <dx:SeriesTitle Font="黑体, 10.5pt, style=Bold" Text="出入库订单" 
+                                    TextColor="255, 255, 255" />
+                            </Titles>
+                        </dx:NestedDoughnutSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:NestedDoughnutSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" 
+                            TextPattern="{V}">
+                            <Border Visibility="True" />
+                        </dx:NestedDoughnutSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series Name="Series 2">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="q" SeriesPointID="0" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="u" SeriesPointID="1" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" SeriesPointID="2" Values="60">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:NestedDoughnutSeriesView>
+                            <Titles>
+                                <dx:SeriesTitle Alignment="Near" TextColor="255, 255, 255" Visibility="True" />
+                            </Titles>
+                        </dx:NestedDoughnutSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:NestedDoughnutSeriesLabel TextPattern="{V}">
+                        </dx:NestedDoughnutSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+        </dx:WebChartControl>
+        </td>
+    
+    <td align="center">
+  
+     <table  Height="800px" Width="auto" ><tr>
+     
+     <td>
+
+      <table  Height="800px" Width="auto" >  
+      
+         <tr> <td  >  
+        
+            <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="800px" PaletteName="Pastel Kit" 
+                  Width="250px">
+                  <BorderOptions Visibility="False" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram Rotated="True">
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="0, 0, 0" Font="黑体, 16pt, style=Bold" MarkerVisible="False" 
+                      TextColor="255, 255, 255" TextVisible="False">
+                      <Border Visibility="False" />
+                      <Title Font="黑体, 16pt, style=Bold" Text="今日绩效" Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                          Visible="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="Black" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 12pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="White">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+
+          </td><td valign="top">
+      
+          </td> </tr>
+      
+      </table>
+     
+     </td>
+     
+     <td> 
+      
+         &nbsp;</td><td align="center" nowrap="nowrap" valign="middle"> 
+    
+            <table>
+          
+          <tr> 
+          
+           <td>
+              
+                  <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="250px" PaletteName="Pastel Kit" Width="250px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:PieSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="出库单据" TextColor="White" />
+                              </Titles>
+                          </dx:PieSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PieSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" Position="Inside" 
+                              TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:PieSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+            <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="250px" PaletteName="Pastel Kit" Width="250px">
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:PieSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="入库单据" TextColor="White" />
+                              </Titles>
+                          </dx:PieSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PieSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" Position="Inside" 
+                              TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:PieSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+               </td>
+               
+               <td> 
+              <dx:WebChartControl ID="WebChartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="480px" PaletteName="Pastel Kit" 
+                  Width="800px">
+                  <BorderOptions Visibility="False" Color="255, 255, 255" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="111111" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="分类任务" TextColor="255, 255, 255" 
+                          Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 12pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+            
+
+                  
+              </td>
+            
+              </tr>
+
+              <tr>
+              <td colspan="2">
+               <dx:WebChartControl ID="WebChartInOutLine" runat="server" BackColor="Black" 
+              CrosshairEnabled="True" Height="300px" Width="1000px">
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <axisx Visibility="True" visibleinpanesserializable="-1" Color="255, 255, 255" 
+                          InterlacedColor="255, 255, 255" Title-Font="黑体, 12pt, style=Bold" 
+                          Title-Text="订单七日趋势" Title-TextColor="255, 255, 255" 
+                          Title-Visibility="Default">
+                          <Tickmarks MinorVisible="False" />
+                          <Label Font="黑体, 10pt" TextColor="255, 255, 255">
+                          </Label>
+                      </axisx>
+                      <axisy Visibility="False" visibleinpanesserializable="-1">
+                      </axisy>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 14pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255" AlignmentVertical="Center">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 14pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18" Color="255, 255, 0" Kind="Diamond">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 10pt, style=Bold" BackColor="Black" 
+                              TextColor="White" TextPattern="{V}">
+                              <Border Visibility="False" Color="White" Thickness="4" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <viewserializable>
+                          <dx:LineSeriesView Color="240, 0, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="240, 0, 0" Size="12">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </viewserializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 10pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+              </td>
+              </tr>
+            </table>
+
+
+        </td>
+        <td>  
+
+        <table>
+        <tr><td>
+            <dx:WebChartControl ID="WebChartStatePie" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+                Width="320px">
+                <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="False">
+                    <Border Visibility="False" />
+                </Legend>
+                <SeriesSerializable>
+                    <dx:Series Name="Series 1">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:NestedDoughnutSeriesView>
+                                <Titles>
+                                    <dx:SeriesTitle Font="黑体, 22pt, style=Bold" Text="任务汇总" TextColor="White" />
+                                </Titles>
+                            </dx:NestedDoughnutSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:NestedDoughnutSeriesLabel Font="Tahoma, 14pt" LineVisibility="True" 
+                                TextPattern="{A}{V}">
+                                <Border Visibility="True" />
+                            </dx:NestedDoughnutSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+            </dx:WebChartControl>
+            </td></tr>
+        <tr><td> 
+            <dx:WebChartControl ID="WebChartLocs" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="400px" PaletteName="Pastel Kit" 
+                Width="320px">
+                <BorderOptions Visibility="False" />
+                <DiagramSerializable>
+                    <dx:XYDiagram>
+                        <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                            Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                            <InterlacedFillStyle FillMode="Solid">
+                            </InterlacedFillStyle>
+                            <Tickmarks MinorVisible="False" />
+                            <Label BackColor="Black" Font="仿宋, 14pt, style=Bold" TextColor="255, 255, 255">
+                            </Label>
+                        </axisx>
+                        <axisy Visibility="False" visibleinpanesserializable="-1">
+                            <Tickmarks MinorVisible="False" Visible="False" />
+                            <Label Visible="False">
+                            </Label>
+                            <GridLines Visible="False">
+                            </GridLines>
+                        </axisy>
+                        <DefaultPane BackColor="0, 0, 0" Weight="2">
+                            <FillStyle FillMode="Solid">
+                            </FillStyle>
+                            <Shadow Color="Black" />
+                        </DefaultPane>
+                    </dx:XYDiagram>
+                </DiagramSerializable>
+                <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                    BackColor="Black" MarkerVisible="False" TextVisible="False">
+                    <Border Visibility="False" />
+                    <Title Font="黑体, 16pt, style=Bold" Text="库位使用" TextColor="255, 255, 255" 
+                        Visible="True"></Title></Legend>
+                <SeriesSerializable>
+                    <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <viewserializable>
+                            <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                <FillStyle FillMode="Hatch">
+                                    <OptionsSerializable>
+                                        <dx:HatchFillOptions Color2="0, 0, 0" />
+                                    </OptionsSerializable>
+                                </FillStyle>
+                            </dx:SideBySideStackedBarSeriesView>
+                        </viewserializable>
+                        <LabelSerializable>
+                            <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 12pt, style=Bold" 
+                                Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                            </dx:StackedBarSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                    <dx:Series LabelsVisibility="True" Name="完成数">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                <Border Color="240, 0, 0" Visibility="False" />
+                                <FillStyle FillMode="Gradient">
+                                    <OptionsSerializable>
+                                        <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                    </OptionsSerializable>
+                                </FillStyle>
+                            </dx:StackedBarSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                            </dx:StackedBarSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+                <SeriesTemplate>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                </SeriesTemplate>
+                <Titles>
+                    <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                        TextColor="255, 255, 255" Visibility="False" />
+                </Titles>
+            </dx:WebChartControl>
+            </td></tr>
+        </table>
+    
+             
+         </td>
+         
+         </tr>
+       </table>
+    </td>
+
+        <td>
+    
+    
+     
+    
+     
+    
+    </td>
+   <td/>
+
+    </tr>
+      <tr>
+            <td align="center" colspan=5>
+               
+                 
+            </td>
+        </tr>
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/Charts - 副本.aspx.exclude b/wms/Charts - 副本.aspx.exclude
new file mode 100644
index 0000000..990a37b
--- /dev/null
+++ b/wms/Charts - 副本.aspx.exclude	
@@ -0,0 +1,389 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:100%;height:100%;background:rgb(0, 112, 192);}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+    
+        <script type="text/javascript" language="javascript">
+	<!-- #include file="../public/JScript.js" -->
+        </script>
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="95%" height="100%"  align="center"   >
+  
+    <tr>
+  <td/><td/>
+    <td align="center"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 29pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;"     />
+     </td>
+    <td></td><td/>
+    </tr>
+
+     <tr><td colspan="5"></p> </p>  </td></tr>
+     <tr><td colspan="5"></p> </p>  </td></tr>
+    <tr>
+    <td/>
+    <td  >
+    
+    
+      
+    
+    
+    
+    </td>
+    
+    <td align="center">
+  
+     <table  Height="800px" Width="400px" ><tr><td> 
+
+      <dx:WebChartControl ID="webChartEmpTasks" runat="server" 
+            CrosshairEnabled="True" Height="800px" Width="400px" 
+                AppearanceNameSerializable="Northern Lights" BackColor="White" 
+                PaletteName="Module">
+            <BorderOptions Visibility="False" />
+            <DiagramSerializable>
+                <dx:XYDiagram PaneLayoutDirection="Horizontal" Rotated="True">
+                    <axisx visibleinpanesserializable="-1" Title-Text="" Visibility="True">
+                        <Tickmarks MinorVisible="False" Visible="False" />
+                        <Label BackColor="255, 255, 255" Font="仿宋, 14pt, style=Bold">
+                        </Label>
+                    </axisx>
+                    <axisy visibleinpanesserializable="-1" Visibility="False">
+                    </axisy>
+                    <DefaultPane BackColor="79, 129, 189" Weight="2">
+                        <Shadow Color="Black" />
+                    </DefaultPane>
+                </dx:XYDiagram>
+            </DiagramSerializable>
+            <Legend Name="Default Legend" Visibility="False"></Legend>
+            <SeriesSerializable>
+                <dx:Series Name="任务数" LabelsVisibility="True" ShowInLegend="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="100">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="200">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <viewserializable>
+                        <dx:SideBySideStackedBarSeriesView BarWidth="0.4" ColorEach="True">
+                        </dx:SideBySideStackedBarSeriesView>
+                    </viewserializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 12pt, style=Bold" Indent="1" 
+                            Position="TopInside">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series LabelsVisibility="True" Name="完成数" Visible="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView BarWidth="0.5" Color="155, 187, 89" ColorEach="True">
+                            <Border Color="0, 112, 192" Visibility="True" />
+                            <FillStyle FillMode="Gradient">
+                                <OptionsSerializable>
+                                    <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+            <SeriesTemplate>
+                <ViewSerializable>
+                    <dx:StackedBarSeriesView>
+                    </dx:StackedBarSeriesView>
+                </ViewSerializable>
+            </SeriesTemplate>
+            <Titles>
+                <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="人员绩效" 
+                    TextColor="0, 112, 192" Visibility="True" />
+            </Titles>
+        </dx:WebChartControl>
+        </td><td> 
+    
+        <dx:WebChartControl ID="WebChartTasks" runat="server" 
+            CrosshairEnabled="True" Height="800px" Width="800px" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="White" 
+                PaletteName="Pastel Kit">
+            <BorderOptions Visibility="False" />
+            <DiagramSerializable>
+                <dx:XYDiagram>
+                    <axisx visibleinpanesserializable="-1" Title-Text="" Visibility="True">
+                        <Tickmarks MinorVisible="False" Visible="False" />
+                        <Label BackColor="255, 255, 255" Font="仿宋, 14pt, style=Bold">
+                        </Label>
+                    </axisx>
+                    <axisy visibleinpanesserializable="-1" Visibility="False">
+                    </axisy>
+                    <DefaultPane BackColor="79, 129, 189" Weight="2">
+                        <Shadow Color="Black" />
+                    </DefaultPane>
+                </dx:XYDiagram>
+            </DiagramSerializable>
+            <Legend Name="Default Legend" Visibility="False"></Legend>
+            <SeriesSerializable>
+                <dx:Series Name="任务数" LabelsVisibility="True" ShowInLegend="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <viewserializable>
+                        <dx:SideBySideStackedBarSeriesView BarWidth="0.4" ColorEach="True">
+                        </dx:SideBySideStackedBarSeriesView>
+                    </viewserializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 12pt, style=Bold" Indent="1" 
+                            Position="TopInside">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series LabelsVisibility="True" Name="完成数">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView BarWidth="0.5" Color="155, 187, 89" ColorEach="True">
+                            <Border Color="0, 112, 192" Visibility="True" />
+                            <FillStyle FillMode="Gradient">
+                                <OptionsSerializable>
+                                    <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+            <SeriesTemplate>
+                <ViewSerializable>
+                    <dx:StackedBarSeriesView>
+                    </dx:StackedBarSeriesView>
+                </ViewSerializable>
+            </SeriesTemplate>
+            <Titles>
+                <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="辣得叫库房任务看板" 
+                    TextColor="0, 112, 192" Visibility="True" />
+            </Titles>
+        </dx:WebChartControl>
+        </td><td>  
+    
+       <dx:WebChartControl ID="webChartLocs" runat="server" 
+            CrosshairEnabled="True" Height="800px" Width="400px" 
+                AppearanceNameSerializable="Northern Lights" BackColor="White" 
+                PaletteName="Module">
+            <BorderOptions Visibility="False" />
+            <DiagramSerializable>
+                <dx:XYDiagram PaneLayoutDirection="Horizontal">
+                    <axisx visibleinpanesserializable="-1" Title-Text="" Visibility="True">
+                        <Tickmarks MinorVisible="False" Visible="False" />
+                        <Label BackColor="255, 255, 255" Font="仿宋, 14pt, style=Bold">
+                        </Label>
+                    </axisx>
+                    <axisy visibleinpanesserializable="-1" Visibility="False">
+                    </axisy>
+                    <DefaultPane BackColor="79, 129, 189" Weight="2">
+                        <Shadow Color="Black" />
+                    </DefaultPane>
+                </dx:XYDiagram>
+            </DiagramSerializable>
+            <Legend Name="Default Legend" Visibility="False"></Legend>
+            <SeriesSerializable>
+                <dx:Series Name="任务数" LabelsVisibility="True" ShowInLegend="False">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="80">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="60">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="100">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="200">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <viewserializable>
+                        <dx:SideBySideStackedBarSeriesView BarWidth="0.4" ColorEach="True">
+                        </dx:SideBySideStackedBarSeriesView>
+                    </viewserializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 12pt, style=Bold" Indent="1" 
+                            Position="TopInside">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+                <dx:Series LabelsVisibility="True" Name="完成数">
+                    <Points>
+                        <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                        </dx:SeriesPoint>
+                        <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                        </dx:SeriesPoint>
+                    </Points>
+                    <ViewSerializable>
+                        <dx:StackedBarSeriesView BarWidth="0.5" Color="155, 187, 89" ColorEach="True">
+                            <Border Color="0, 112, 192" Visibility="True" />
+                            <FillStyle FillMode="Gradient">
+                                <OptionsSerializable>
+                                    <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                </OptionsSerializable>
+                            </FillStyle>
+                        </dx:StackedBarSeriesView>
+                    </ViewSerializable>
+                    <LabelSerializable>
+                        <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=Bold">
+                        </dx:StackedBarSeriesLabel>
+                    </LabelSerializable>
+                </dx:Series>
+            </SeriesSerializable>
+            <SeriesTemplate>
+                <ViewSerializable>
+                    <dx:StackedBarSeriesView>
+                    </dx:StackedBarSeriesView>
+                </ViewSerializable>
+            </SeriesTemplate>
+            <Titles>
+                  <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                    TextColor="0, 112, 192" Visibility="True" />
+            </Titles>
+        </dx:WebChartControl>
+
+        </td></tr>
+       </table>
+    </td>
+
+        <td>
+    
+    
+     
+    
+     
+    
+    </td>
+   <td/>
+
+    </tr>
+      <tr>
+            <td align="center" colspan=5>
+               
+                 
+            </td>
+        </tr>
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/Charts.aspx b/wms/Charts.aspx
new file mode 100644
index 0000000..b85a779
--- /dev/null
+++ b/wms/Charts.aspx
@@ -0,0 +1,751 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:99%;height:99%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+     
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="99%" height="100%"  align="center"   >
+  
+
+
+     <tr><td  align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+               <br /> 
+                得牛WMS任务看板 
+               
+             <br />
+          </td>
+          </tr>
+    <tr>
+  
+    <td align="left"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;"     />
+     </td>
+    
+    </tr>
+     <tr><td  >   </td></tr>
+         <tr><td align="center"> <dx:WebChartControl ID="WebChartPartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="260px" PaletteName="Pastel Kit" 
+                  Width="2340px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" 
+                 Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Padding Bottom="1" Left="1" Right="1" Top="1" />
+                      <Margins Bottom="1" Left="1" Right="1" Top="1" />
+                      <Title Font="黑体, 20pt, style=Bold" Text="货区任务" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 5pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> </td></tr>
+    <tr> 
+    <td align="center">
+  
+     <table  ><tr>
+     
+        <td valign="top">
+               <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="420px" onobjectselected="WebChartEmpTasks_ObjectSelected">
+                   <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram Rotated="True">
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  <Border Color="Aqua" Visibility="False" />
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="0, 0, 0" Font="黑体, 22pt, style=Bold" MarkerVisible="False" 
+                      TextColor="255, 255, 255" TextVisible="False" 
+                       AlignmentVertical="TopOutside">
+                      <Border Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="今日绩效" Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                          Visible="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="Black" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="White">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+                  
+               <dx:WebChartControl ID="WebChartLocs" runat="server" 
+                      AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                      CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                   Width="420px">
+                       <BorderOptions Color="63, 63, 63" />
+                      <DiagramSerializable>
+                          <dx:XYDiagram Rotated="True">
+                              <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                                  Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                                  <InterlacedFillStyle FillMode="Solid">
+                                  </InterlacedFillStyle>
+                                  <Tickmarks MinorVisible="False" />
+                                  <Label BackColor="Black"  Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  </Label>
+                                  <VisualRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                                  <WholeRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                              </axisx>
+                              <axisy Visibility="False" visibleinpanesserializable="-1">
+                                  <Tickmarks MinorVisible="False" Visible="False" />
+                                  <Label Visible="False">
+                                  </Label>
+                                  <GridLines Visible="False">
+                                  </GridLines>
+                              </axisy>
+                              <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                                  <FillStyle FillMode="Solid">
+                                  </FillStyle>
+                                  <Shadow Color="Black" />
+                              </DefaultPane>
+                          </dx:XYDiagram>
+                      </DiagramSerializable>
+                      <Legend AlignmentHorizontal="Center" BackColor="Black" MarkerVisible="False" 
+                          Name="Default Legend" TextVisible="False" Visibility="True" Font="黑体, 18pt" 
+                           AlignmentVertical="TopOutside">
+                          <Border Visibility="False" />
+                          <Title Font="黑体, 18pt, style=Bold" Text="库位使用百分比" TextColor="255, 255, 255" 
+                              Visible="True"></Title></Legend>
+                      <SeriesSerializable>
+                          <dx:Series LabelsVisibility="True" Name="完成数">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="6.21">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="0.27">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="0">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <viewserializable>
+                                  <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                      <Border Color="240, 0, 0" Visibility="False" />
+                                      <FillStyle FillMode="Gradient">
+                                          <OptionsSerializable>
+                                              <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:StackedBarSeriesView>
+                              </viewserializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                          <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                              Visible="False">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <ViewSerializable>
+                                  <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                      <FillStyle FillMode="Hatch">
+                                          <OptionsSerializable>
+                                              <dx:HatchFillOptions Color2="Black" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:SideBySideStackedBarSeriesView>
+                              </ViewSerializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold" BackColor="Black" 
+                                      Indent="1" Position="TopInside" TextColor="White">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                      </SeriesSerializable>
+                      <SeriesTemplate>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                      </SeriesTemplate>
+                      <Titles>
+                          <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                              TextColor="255, 255, 255" Visibility="False" />
+                      </Titles>
+                  </dx:WebChartControl>
+
+        </td>
+     
+   <td   valign="top"> 
+    
+             
+              <dx:WebChartControl ID="WebChartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="1500px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="出库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series Name="任务数" LabelsVisibility="True">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <Border Visibility="True" />
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                                  <Border Visibility="False" />
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> 
+              
+               <dx:WebChartControl ID="WebChartInOutLines" runat="server" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" Width="1500px">
+                   <BorderOptions Color="63, 63, 63" />
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <axisx Visibility="True" visibleinpanesserializable="-1" Color="255, 255, 255" 
+                          InterlacedColor="255, 255, 255" Title-Font="黑体, 18pt, style=Bold" 
+                          Title-Text="" Title-TextColor="255, 255, 255" 
+                          Title-Visibility="True">
+                          <Tickmarks MinorVisible="False" />
+                          <Label Font="黑体, 12pt" TextColor="255, 255, 255">
+                          </Label>
+                          <GridLines Visible="True">
+                          </GridLines>
+                      </axisx>
+                      <axisy Visibility="False" visibleinpanesserializable="-1">
+                      </axisy>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 18pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255" AlignmentVertical="Center">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 18pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18" Color="255, 255, 0" Kind="Diamond">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="黑体, 14pt, style=Bold" BackColor="Black" 
+                              TextColor="White" TextPattern="{V}">
+                              <Border Visibility="False" Color="White" Thickness="4" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <viewserializable>
+                          <dx:LineSeriesView Color="240, 0, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="240, 0, 0" Size="12">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </viewserializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 14pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+            
+
+        </td>
+        <td valign="top">  
+ 
+           <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+               <BorderOptions Color="63, 63, 63" />
+                   <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" 
+                   AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="出库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                             
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文中宋, 22pt" LineVisibility="True" 
+                              Position="Inside" TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+            <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+                <BorderOptions Color="63, 63, 63" />
+              <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="入库单据" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LabelsVisibility="True" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文宋体, 22pt" LineVisibility="False" 
+                              Position="Inside" TextPattern="{A}{V}" TextAlignment="Near">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+        
+             
+              <dx:WebChartControl ID="WebChartStatePie" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                Width="420px">
+                  <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:SimpleDiagram LabelsResolveOverlappingMinIndent="-5">
+                      </dx:SimpleDiagram>
+                  </DiagramSerializable>
+                <Legend Name="Default Legend" Visibility="True" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" Direction="LeftToRight" AlignmentHorizontal="Center">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 18pt, style=Bold" Text="任务汇总" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                <SeriesSerializable>
+                    <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:PieSeriesView>
+                                
+                            </dx:PieSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:PieSeriesLabel Font="华文宋体, 22pt, style=Bold" LineVisibility="True" Position="Inside" 
+                                TextPattern="{A}" ResolveOverlappingMode="Default">
+                                <Border Visibility="True" />
+                            </dx:PieSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+            </dx:WebChartControl>
+
+        
+             
+         </td>
+         
+         </tr>
+       </table>
+    </td>
+     </tr>
+
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/Charts.aspx - 副本.cs b/wms/Charts.aspx - 副本.cs
new file mode 100644
index 0000000..1f9d4cd
--- /dev/null
+++ b/wms/Charts.aspx - 副本.cs	
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+ 
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+ 
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+    DataSet ds;
+    lCharts lchart = new lCharts();
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        loadData();
+    }
+
+    void loadData()
+    {
+        ds = lchart.getDailyKanBanData();
+        setTasks();
+        setLocs();
+        setUserTasks();
+    }
+  
+
+    void setLocs()
+    {
+        
+
+        DataTable dt = ds.Tables[2];
+ 
+        Series taskSeries = this.webChartLocs.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+             
+        }
+        Series finishedSeries = webChartLocs.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+        }
+
+    }
+    void setUserTasks()
+    {
+  
+        DataTable dt = ds.Tables[1];
+
+        Series taskSeries = this.webChartEmpTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+
+    }
+    void setTasks()
+    {
+        DataTable dt = ds.Tables[0];
+
+        Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+        Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+        
+    }
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+       // loadData();// Page_Load(sender, e);
+    }
+}
\ No newline at end of file
diff --git a/wms/Charts.aspx.cs b/wms/Charts.aspx.cs
new file mode 100644
index 0000000..e188ed1
--- /dev/null
+++ b/wms/Charts.aspx.cs
@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+ 
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+ 
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+    DataSet dsDaily;
+    DataSet dsErpOrders;
+    lCharts lchart = new lCharts();
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        loadDailyData();
+
+        loadErpData();
+    }
+
+    private void loadErpData()
+    {
+        dsErpOrders = lchart.getErpOderData();
+
+        //set erp in orders pie
+
+        DataTable dt = dsErpOrders.Tables[0];
+
+        Series taskSeries = WebChartInOrders.SeriesSerializable[0];
+
+        //Series taskSeries2 = this.WebChartErpOrders.SeriesSerializable[0];
+        //taskSeries2.Points.Clear();
+       
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+
+        }
+        //set erp out orders pie
+        dt = dsErpOrders.Tables[1];
+
+        taskSeries = WebChartOutOrders.SeriesSerializable[0];
+       // taskSeries2 = this.WebChartErpOrders.SeriesSerializable[1];
+        taskSeries.Points.Clear();
+        //taskSeries2.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        { 
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+          //  taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+        }
+
+
+        
+
+        // in out line counts 
+
+        string day = "";
+        dt = dsErpOrders.Tables[2];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+
+
+        dt = dsErpOrders.Tables[3];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[1];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+        
+
+    }
+
+    void loadDailyData()
+    {
+        dsDaily = lchart.getDailyKanBanData();
+        setTasks();
+        setLocs();
+        setUserTasks();
+        setTasksSumByStatePie();
+        setPartTasks();
+    }
+
+    private void setTasksSumByStatePie()
+    {
+     
+
+        DataTable dt = dsDaily.Tables[3];
+
+        Series taskSeries = WebChartStatePie.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+    }
+  
+
+    void setLocs()
+    {
+        
+
+        DataTable dt = dsDaily.Tables[2];
+
+        Series taskSeries = WebChartLocs.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), dr["usedPercent"].ToString()) );
+             
+        }
+        /*
+        Series finishedSeries = this.WebChartLocs.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+        }
+        */
+
+
+    }
+    void setUserTasks()
+    {
+  
+        DataTable dt = dsDaily.Tables[1];
+
+        Series taskSeries = WebChartEmpTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+
+    }
+    void setTasks()
+    {
+        DataTable dt = dsDaily.Tables[0];
+
+        Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+        Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+        
+    }
+    void setPartTasks()
+    {
+        DataTable dt = dsDaily.Tables[4];
+
+        Series taskSeries = this.WebChartPartTasks .SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+        Series finishedSeries = WebChartPartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+
+    }
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+       // loadData();// Page_Load(sender, e);
+    }
+    protected void WebChartEmpTasks_ObjectSelected(object sender, HotTrackEventArgs e)
+    {
+
+    }
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+
+        loadDailyData();
+
+        loadErpData();
+    }
+}
\ No newline at end of file
diff --git a/wms/ChartsNew.aspx b/wms/ChartsNew.aspx
new file mode 100644
index 0000000..65dd6b3
--- /dev/null
+++ b/wms/ChartsNew.aspx
@@ -0,0 +1,749 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="ChartsNew.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<!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 runat="server">
+    <title></title>
+
+    <style>
+    #warp{width:99%;height:99%;background:#000;}
+    </style>
+</head>
+<body  id="warp">
+    <form id="form1" runat="server">
+     
+
+        <asp:ScriptManager ID="ScriptManager1" runat="server" EnableScriptGlobalization="True"
+            EnableScriptLocalization="True" AsyncPostBackTimeout="180">
+        </asp:ScriptManager>
+
+
+    <div>
+     <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+                                    <ContentTemplate>
+                                        
+                             
+
+   <table width="99%" height="100%"  align="center"   >
+  
+
+
+     <tr><td  align="center"  style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;" > 
+               <br /> 
+                得牛WMS任务看板 
+               
+             <br />
+          </td>
+          </tr>
+    <tr>
+  
+    <td align="left"> <input name="thetime" style="border-style: none; border-color: inherit; border-width: 0;  font-size: 36pt; 
+                          background:inherit;  color: White; width:100%; text-align:center;"     />
+     </td>
+    
+    </tr>
+     <tr><td  >   </td></tr>
+         <tr><td align="center"> <dx:WebChartControl ID="WebChartPartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="260px" PaletteName="Pastel Kit" 
+                  Width="2340px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" 
+                 Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Padding Bottom="1" Left="1" Right="1" Top="1" />
+                      <Margins Bottom="1" Left="1" Right="1" Top="1" />
+                      <Title Font="黑体, 20pt, style=Bold" Text="货区任务" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 5pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> </td></tr>
+    <tr> 
+    <td align="center">
+  
+     <table  ><tr>
+     
+        <td valign="top">
+               <dx:WebChartControl ID="WebChartEmpTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="420px" onobjectselected="WebChartEmpTasks_ObjectSelected">
+                   <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:XYDiagram Rotated="True">
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  <Border Color="Aqua" Visibility="False" />
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Center" 
+                      BackColor="0, 0, 0" Font="黑体, 22pt, style=Bold" MarkerVisible="False" 
+                      TextColor="255, 255, 255" TextVisible="False" 
+                       AlignmentVertical="TopOutside">
+                      <Border Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="今日绩效" Visible="True"></Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series LabelsVisibility="True" Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                          Visible="False">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="Black" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="Black" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="White">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="当日绩效" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl>
+                  
+               <dx:WebChartControl ID="WebChartLocs" runat="server" 
+                      AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                      CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                   Width="420px">
+                       <BorderOptions Color="63, 63, 63" />
+                      <DiagramSerializable>
+                          <dx:XYDiagram Rotated="True">
+                              <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                                  Title-Visibility="True" Visibility="True" visibleinpanesserializable="-1">
+                                  <InterlacedFillStyle FillMode="Solid">
+                                  </InterlacedFillStyle>
+                                  <Tickmarks MinorVisible="False" />
+                                  <Label BackColor="Black"  Font="仿宋, 20pt, style=Bold" TextColor="255, 255, 255">
+                                  </Label>
+                                  <VisualRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                                  <WholeRange Auto="False" MaxValueSerializable="5" MinValueSerializable="验收" />
+                              </axisx>
+                              <axisy Visibility="False" visibleinpanesserializable="-1">
+                                  <Tickmarks MinorVisible="False" Visible="False" />
+                                  <Label Visible="False">
+                                  </Label>
+                                  <GridLines Visible="False">
+                                  </GridLines>
+                              </axisy>
+                              <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                                  <FillStyle FillMode="Solid">
+                                  </FillStyle>
+                                  <Shadow Color="Black" />
+                              </DefaultPane>
+                          </dx:XYDiagram>
+                      </DiagramSerializable>
+                      <Legend AlignmentHorizontal="Center" BackColor="Black" MarkerVisible="False" 
+                          Name="Default Legend" TextVisible="False" Visibility="True" Font="黑体, 18pt" 
+                           AlignmentVertical="TopOutside">
+                          <Border Visibility="False" />
+                          <Title Font="黑体, 18pt, style=Bold" Text="库位使用百分比" TextColor="255, 255, 255" 
+                              Visible="True"></Title></Legend>
+                      <SeriesSerializable>
+                          <dx:Series LabelsVisibility="True" Name="完成数">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="6.21">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="0.27">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="0">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="0">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <viewserializable>
+                                  <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                      <Border Color="240, 0, 0" Visibility="False" />
+                                      <FillStyle FillMode="Gradient">
+                                          <OptionsSerializable>
+                                              <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:StackedBarSeriesView>
+                              </viewserializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                          <dx:Series LabelsVisibility="True" Name="任务数" ShowInLegend="False" 
+                              Visible="False">
+                              <Points>
+                                  <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                                  </dx:SeriesPoint>
+                                  <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                                  </dx:SeriesPoint>
+                              </Points>
+                              <ViewSerializable>
+                                  <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                      <FillStyle FillMode="Hatch">
+                                          <OptionsSerializable>
+                                              <dx:HatchFillOptions Color2="Black" />
+                                          </OptionsSerializable>
+                                      </FillStyle>
+                                  </dx:SideBySideStackedBarSeriesView>
+                              </ViewSerializable>
+                              <LabelSerializable>
+                                  <dx:StackedBarSeriesLabel Font="Tahoma, 18pt, style=Bold" BackColor="Black" 
+                                      Indent="1" Position="TopInside" TextColor="White">
+                                  </dx:StackedBarSeriesLabel>
+                              </LabelSerializable>
+                          </dx:Series>
+                      </SeriesSerializable>
+                      <SeriesTemplate>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                      </SeriesTemplate>
+                      <Titles>
+                          <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="货位使用" 
+                              TextColor="255, 255, 255" Visibility="False" />
+                      </Titles>
+                  </dx:WebChartControl>
+
+        </td>
+     
+   <td   valign="top"> 
+    
+             
+              <dx:WebChartControl ID="WebChartTasks" runat="server" 
+                  AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                  CrosshairEnabled="True" Height="640px" PaletteName="Pastel Kit" 
+                  Width="1500px"> <BorderOptions Color="63, 63, 63"   />
+                  <DiagramSerializable>
+                      <dx:XYDiagram>
+                          <axisx Color="White" InterlacedColor="White" Title-Text="" 
+                              Title-Visibility="Default" Visibility="True" 
+                              visibleinpanesserializable="-1">
+                              <InterlacedFillStyle FillMode="Solid">
+                              </InterlacedFillStyle>
+                              <Tickmarks MinorVisible="False" />
+                              <Label BackColor="Black" Font="仿宋, 22pt, style=Bold" TextColor="255, 255, 255">
+                              </Label>
+                          </axisx>
+                          <axisy Visibility="False" visibleinpanesserializable="-1" 
+                              Title-Visibility="Default">
+                              <Tickmarks MinorVisible="False" Visible="False" />
+                              <GridLines Visible="False">
+                              </GridLines>
+                          </axisy>
+                          <DefaultPane BackColor="0, 0, 0" Weight="2" BorderVisible="False">
+                              <FillStyle FillMode="Solid">
+                              </FillStyle>
+                              <Shadow Color="Black" />
+                          </DefaultPane>
+                      </dx:XYDiagram>
+                  </DiagramSerializable>
+                  <Legend Name="Default Legend" Visibility="True" AlignmentHorizontal="Left" 
+                      BackColor="Black" MarkerVisible="False" TextColor="255, 255, 255" 
+                      TextVisible="False" AlignmentVertical="Center" Direction="LeftToRight">
+                      <Border Color="255, 255, 255" Visibility="False" />
+                      <Title Font="黑体, 22pt, style=Bold" Text="分类任务" TextColor="255, 255, 255" 
+                          Visible="True" Alignment="Near" WordWrap="True">
+                          <Margins Bottom="0" Left="0" Right="0" Top="0" />
+                      </Title></Legend>
+                  <SeriesSerializable>
+                      <dx:Series Name="任务数" LabelsVisibility="True">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="100">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="60">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="100">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <viewserializable>
+                              <dx:SideBySideStackedBarSeriesView BarWidth="0.5" Color="221, 217, 195">
+                                  <Border Visibility="True" />
+                                  <FillStyle FillMode="Hatch">
+                                      <OptionsSerializable>
+                                          <dx:HatchFillOptions Color2="0, 0, 0" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:SideBySideStackedBarSeriesView>
+                          </viewserializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel BackColor="0, 0, 0" Font="Tahoma, 18pt, style=Bold" 
+                                  Indent="1" Position="TopInside" TextColor="255, 255, 255">
+                                  <Border Visibility="False" />
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                      <dx:Series Name="完成数">
+                          <Points>
+                              <dx:SeriesPoint ArgumentSerializable="验收" Values="50">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="2" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="3" Values="20">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="4" Values="30">
+                              </dx:SeriesPoint>
+                              <dx:SeriesPoint ArgumentSerializable="5" Values="40">
+                              </dx:SeriesPoint>
+                          </Points>
+                          <ViewSerializable>
+                              <dx:StackedBarSeriesView BarWidth="0.5" Color="240, 0, 0" ColorEach="True">
+                                  <Border Color="240, 0, 0" Visibility="False" />
+                                  <FillStyle FillMode="Gradient">
+                                      <OptionsSerializable>
+                                          <dx:RectangleGradientFillOptions GradientMode="BottomToTop" />
+                                      </OptionsSerializable>
+                                  </FillStyle>
+                              </dx:StackedBarSeriesView>
+                          </ViewSerializable>
+                          <LabelSerializable>
+                              <dx:StackedBarSeriesLabel Font="Tahoma, 10pt, style=bold">
+                              </dx:StackedBarSeriesLabel>
+                          </LabelSerializable>
+                      </dx:Series>
+                  </SeriesSerializable>
+                  <SeriesTemplate>
+                      <ViewSerializable>
+                          <dx:StackedBarSeriesView>
+                          </dx:StackedBarSeriesView>
+                      </ViewSerializable>
+                  </SeriesTemplate>
+                  <Titles>
+                      <dx:ChartTitle Font="黑体, 22pt, style=Bold" Text="任务一览" 
+                          TextColor="255, 255, 255" Visibility="False" />
+                  </Titles>
+              </dx:WebChartControl> 
+              
+               <dx:WebChartControl ID="WebChartInOutLines" runat="server" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" Width="1500px">
+                   <BorderOptions Color="63, 63, 63" />
+              <DiagramSerializable>
+                  <dx:XYDiagram>
+                      <axisx Visibility="True" visibleinpanesserializable="-1" Color="255, 255, 255" 
+                          InterlacedColor="255, 255, 255" Title-Font="黑体, 18pt, style=Bold" 
+                          Title-Text="" Title-TextColor="255, 255, 255" 
+                          Title-Visibility="True">
+                          <Tickmarks MinorVisible="False" />
+                          <Label Font="黑体, 12pt" TextColor="255, 255, 255">
+                          </Label>
+                          <GridLines Visible="True">
+                          </GridLines>
+                      </axisx>
+                      <axisy Visibility="False" visibleinpanesserializable="-1">
+                      </axisy>
+                      <DefaultPane BackColor="0, 0, 0">
+                      </DefaultPane>
+                  </dx:XYDiagram>
+              </DiagramSerializable>
+              <Legend AlignmentHorizontal="Center" BackColor="Black" 
+                  Font="黑体, 18pt, style=Bold" MarkerSize="30, 26" Name="Default Legend" 
+                  TextColor="255, 255, 255" AlignmentVertical="Center">
+                  <Border Visibility="False" />
+                  <Title Font="黑体, 18pt, style=Bold"></Title></Legend>
+              <SeriesSerializable>
+                  <dx:Series LabelsVisibility="True" Name="出库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="500">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/10/1 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:LineSeriesView Color="255, 255, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Size="18" Color="255, 255, 0" Kind="Diamond">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="黑体, 14pt, style=Bold" BackColor="Black" 
+                              TextColor="White" TextPattern="{V}">
+                              <Border Visibility="False" Color="White" Thickness="4" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+                  <dx:Series LabelsVisibility="True" Name="入库订单行数">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="2023-10-1" Values="100">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="2023/11/8 0:00:00" Values="200">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <viewserializable>
+                          <dx:LineSeriesView Color="240, 0, 0" MarkerVisibility="True">
+                              <LineStyle Thickness="5" />
+                              <LineMarkerOptions Color="240, 0, 0" Size="12">
+                              </LineMarkerOptions>
+                          </dx:LineSeriesView>
+                      </viewserializable>
+                      <LabelSerializable>
+                          <dx:PointSeriesLabel Font="Tahoma, 14pt, style=Bold" LineVisibility="True">
+                              <Border Visibility="False" />
+                          </dx:PointSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+            
+
+        </td>
+        <td valign="top">  
+ 
+           <dx:WebChartControl ID="WebChartOutOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+               <BorderOptions Color="63, 63, 63" />
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="True" 
+                   AlignmentHorizontal="Right" AlignmentVertical="BottomOutside" BackColor="Black" 
+                   Direction="LeftToRight" Font="黑体, 12pt" TextColor="White">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 18pt, style=Bold" Text="出库单据" TextColor="White" 
+                                      Alignment="Near" Dock="Right" Visibility="True" />
+                              </Titles>
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文中宋, 18pt" LineVisibility="True" 
+                              Position="Inside" TextPattern="{A}{V}">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+            <dx:WebChartControl ID="WebChartInOrders" runat="server" 
+              AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+              CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" Width="420px">
+                <BorderOptions Color="63, 63, 63" />
+              <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="True" 
+                    AlignmentHorizontal="Right" AlignmentVertical="BottomOutside" BackColor="Black" 
+                    Direction="LeftToRight" Font="黑体, 12pt" TextColor="White">
+                  <Border Visibility="False" />
+              </Legend>
+              <SeriesSerializable>
+                  <dx:Series Name="Series 1" LabelsVisibility="True" LegendTextPattern="{V}">
+                      <Points>
+                          <dx:SeriesPoint ArgumentSerializable="未到货" SeriesPointID="0" Values="20">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成验收" SeriesPointID="1" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="完成上架" SeriesPointID="2" Values="30">
+                          </dx:SeriesPoint>
+                          <dx:SeriesPoint ArgumentSerializable="正在验收" SeriesPointID="3" Values="1">
+                          </dx:SeriesPoint>
+                      </Points>
+                      <ViewSerializable>
+                          <dx:DoughnutSeriesView>
+                              <Titles>
+                                  <dx:SeriesTitle Font="黑体, 18pt, style=Bold" Text="入库单据" TextColor="White" 
+                                      Alignment="Near" Dock="Right" />
+                              </Titles>
+                          </dx:DoughnutSeriesView>
+                      </ViewSerializable>
+                      <LabelSerializable>
+                          <dx:DoughnutSeriesLabel Font="华文宋体, 22pt" LineVisibility="False" 
+                              Position="Inside" TextPattern="{A}{V}" TextAlignment="Near">
+                              <Border Visibility="True" />
+                          </dx:DoughnutSeriesLabel>
+                      </LabelSerializable>
+                  </dx:Series>
+              </SeriesSerializable>
+          </dx:WebChartControl>
+
+        
+             
+              <dx:WebChartControl ID="WebChartStatePie" runat="server" 
+                AppearanceNameSerializable="Pastel Kit" BackColor="Black" 
+                CrosshairEnabled="True" Height="320px" PaletteName="Pastel Kit" 
+                Width="420px">
+                  <BorderOptions Color="63, 63, 63" />
+                  <DiagramSerializable>
+                      <dx:SimpleDiagram LabelsResolveOverlappingMinIndent="-5">
+                      </dx:SimpleDiagram>
+                  </DiagramSerializable>
+                <Legend MarkerSize="20, 22" Name="Default Legend" Visibility="True" 
+                      AlignmentHorizontal="Right" AlignmentVertical="BottomOutside" 
+                      BackColor="Black" Direction="LeftToRight" Font="黑体, 12pt" 
+                      TextColor="255, 255, 255">
+                    <Border Visibility="False" />
+                </Legend>
+                <SeriesSerializable>
+                    <dx:Series Name="Series 1" LegendTextPattern="{V}">
+                        <Points>
+                            <dx:SeriesPoint ArgumentSerializable="a  " SeriesPointID="0" Values="20">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="b  " SeriesPointID="1" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="c  " SeriesPointID="2" Values="30">
+                            </dx:SeriesPoint>
+                            <dx:SeriesPoint ArgumentSerializable="d  " SeriesPointID="3" Values="1">
+                            </dx:SeriesPoint>
+                        </Points>
+                        <ViewSerializable>
+                            <dx:PieSeriesView>
+                                <Titles>
+                                    <dx:SeriesTitle Font="黑体, 18pt, style=Bold" Text="任务汇总" TextColor="White" 
+                                        Dock="Right" Indent="0" Visibility="True" Alignment="Near" />
+                                </Titles>
+                            </dx:PieSeriesView>
+                        </ViewSerializable>
+                        <LabelSerializable>
+                            <dx:PieSeriesLabel Font="华文宋体, 22pt, style=Bold" LineVisibility="True" Position="Inside" 
+                                TextPattern="{A}" ResolveOverlappingMode="Default">
+                                <Border Visibility="True" />
+                            </dx:PieSeriesLabel>
+                        </LabelSerializable>
+                    </dx:Series>
+                </SeriesSerializable>
+            </dx:WebChartControl>
+
+        
+             
+         </td>
+         
+         </tr>
+       </table>
+    </td>
+     </tr>
+
+    </table>
+                                      
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+ 
+ 
+ 
+    </div>
+    </form>
+     <script language="JavaScript">
+
+
+         function showDate() {
+             now = new Date();  
+             document.form1.thetime.value = now.toLocaleString();
+            
+             setTimeout("showDate()", 1000);
+         }
+         showDate();
+
+         function updateCharts() {
+             var theForm = document.forms['form1'];
+             if (!theForm) {
+                 theForm = document.form1;
+             }
+             theForm.submit();
+             setTimeout("updateCharts()",60000);
+         }
+         // updateCharts();
+
+          setTimeout(" location.reload()", 60000);
+         // ------->
+
+         var prm = Sys.WebForms.PageRequestManager.getInstance();
+
+         prm.add_initializeRequest(InitializeRequest);
+         prm.add_endRequest(EndRequest);
+
+         function InitializeRequest(sender, args) {
+             $get('Container').style.cursor = 'wait';
+         }
+
+         function EndRequest(sender, args) {
+             $get('Container').style.cursor = 'auto';
+         }
+
+       
+       
+       </script>
+</body>
+</html>
diff --git a/wms/ChartsNew.aspx.cs b/wms/ChartsNew.aspx.cs
new file mode 100644
index 0000000..c2b44f2
--- /dev/null
+++ b/wms/ChartsNew.aspx.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+ 
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+ 
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+    DataSet dsDaily;
+    DataSet dsErpOrders;
+    lCharts lchart = new lCharts();
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        loadDailyData();
+
+        loadErpData();
+    }
+
+    private void loadErpData()
+    {
+        dsErpOrders = lchart.getErpOderData();
+
+        //set erp in orders pie
+
+        DataTable dt = dsErpOrders.Tables[0];
+
+        Series taskSeries = WebChartInOrders.SeriesSerializable[0];
+
+        //Series taskSeries2 = this.WebChartErpOrders.SeriesSerializable[0];
+        //taskSeries2.Points.Clear();
+       
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+
+        }
+        //set erp out orders pie
+        dt = dsErpOrders.Tables[1];
+
+        taskSeries = WebChartOutOrders.SeriesSerializable[0];
+       // taskSeries2 = this.WebChartErpOrders.SeriesSerializable[1];
+        taskSeries.Points.Clear();
+        //taskSeries2.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        { 
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+          //  taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+        }
+
+
+        
+
+        // in out line counts 
+
+        string day = "";
+        dt = dsErpOrders.Tables[2];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+
+
+        dt = dsErpOrders.Tables[3];
+
+        taskSeries = WebChartInOutLines.SeriesSerializable[1];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+            taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+        }
+       
+        
+
+    }
+
+    void loadDailyData()
+    {
+        dsDaily = lchart.getDailyKanBanData();
+        setTasks();
+        setLocs();
+        setUserTasks();
+        setTasksSumByStatePie();
+        setPartTasks();
+    }
+
+    private void setTasksSumByStatePie()
+    {
+     
+
+        DataTable dt = dsDaily.Tables[3];
+
+        Series taskSeries = WebChartStatePie.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+    }
+  
+
+    void setLocs()
+    {
+        
+
+        DataTable dt = dsDaily.Tables[2];
+
+        Series taskSeries = WebChartLocs.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+           // taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+            taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), dr["usedPercent"].ToString()) );
+             
+        }
+        /*
+        Series finishedSeries = this.WebChartLocs.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+        }
+        */
+
+
+    }
+    void setUserTasks()
+    {
+  
+        DataTable dt = dsDaily.Tables[1];
+
+        Series taskSeries = WebChartEmpTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+
+    }
+    void setTasks()
+    {
+        DataTable dt = dsDaily.Tables[0];
+
+        Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+         
+        Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+        
+    }
+    void setPartTasks()
+    {
+        DataTable dt = dsDaily.Tables[4];
+
+        Series taskSeries = this.WebChartPartTasks .SeriesSerializable[0];
+
+        taskSeries.Points.Clear();
+
+        foreach (DataRow dr in dt.Rows)
+        {
+            taskSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+        }
+
+        Series finishedSeries = WebChartPartTasks.SeriesSerializable[1];
+
+        finishedSeries.Points.Clear();
+        foreach (DataRow dr in dt.Rows)
+        {
+            finishedSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+        }
+
+
+
+    }
+    protected void btnSubmit_Click(object sender, EventArgs e)
+    {
+       // loadData();// Page_Load(sender, e);
+    }
+    protected void WebChartEmpTasks_ObjectSelected(object sender, HotTrackEventArgs e)
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/wms/GoodIn.aspx b/wms/GoodIn.aspx
new file mode 100644
index 0000000..5e6247e
--- /dev/null
+++ b/wms/GoodIn.aspx
@@ -0,0 +1,16 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/masterPage.master" AutoEventWireup="true" CodeFile="GoodIn.aspx.cs" Inherits="wms_GoodIn" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
+
+ 
+
+
+
+
+
+
+
+
+
+</asp:Content>
+
diff --git a/wms/GoodIn.aspx.cs b/wms/GoodIn.aspx.cs
new file mode 100644
index 0000000..24bed7b
--- /dev/null
+++ b/wms/GoodIn.aspx.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class wms_GoodIn : PageBase
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
\ No newline at end of file